/[emacs]/emacs/src/xdisp.c
ViewVC logotype

Diff of /emacs/src/xdisp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.738 by monnier, Wed Mar 13 14:16:15 2002 UTC revision 1.739 by rms, Sat Mar 16 07:05:59 2002 UTC
# Line 226  Lisp_Object Qgrow_only; Line 226  Lisp_Object Qgrow_only;
226  Lisp_Object Qinhibit_eval_during_redisplay;  Lisp_Object Qinhibit_eval_during_redisplay;
227  Lisp_Object Qbuffer_position, Qposition, Qobject;  Lisp_Object Qbuffer_position, Qposition, Qobject;
228    
229    /* Holds the list (error).  */
230    Lisp_Object list_of_error;
231    
232  /* Functions called to fontify regions of text.  */  /* Functions called to fontify regions of text.  */
233    
234  Lisp_Object Vfontification_functions;  Lisp_Object Vfontification_functions;
# Line 1323  safe_eval (sexpr) Line 1326  safe_eval (sexpr)
1326    
1327        GCPRO1 (sexpr);        GCPRO1 (sexpr);
1328        specbind (Qinhibit_redisplay, Qt);        specbind (Qinhibit_redisplay, Qt);
1329        val = internal_condition_case_1 (Feval, sexpr, Qerror,        /* Use Qt to ensure debugger does not run,
1330             so there is no possibility of wanting to redisplay.  */
1331          val = internal_condition_case_1 (Feval, sexpr, Qt,
1332                                         safe_eval_handler);                                         safe_eval_handler);
1333        UNGCPRO;        UNGCPRO;
1334        val = unbind_to (count, val);        val = unbind_to (count, val);
# Line 1354  safe_call (nargs, args) Line 1359  safe_call (nargs, args)
1359        GCPRO1 (args[0]);        GCPRO1 (args[0]);
1360        gcpro1.nvars = nargs;        gcpro1.nvars = nargs;
1361        specbind (Qinhibit_redisplay, Qt);        specbind (Qinhibit_redisplay, Qt);
1362        val = internal_condition_case_2 (Ffuncall, nargs, args, Qerror,        /* Use Qt to ensure debugger does not run,
1363             so there is no possibility of wanting to redisplay.  */
1364          val = internal_condition_case_2 (Ffuncall, nargs, args, Qt,
1365                                         safe_eval_handler);                                         safe_eval_handler);
1366        UNGCPRO;        UNGCPRO;
1367        val = unbind_to (count, val);        val = unbind_to (count, val);
# Line 8960  redisplay_internal (preserve_echo_area) Line 8967  redisplay_internal (preserve_echo_area)
8967        struct frame *mini_frame;        struct frame *mini_frame;
8968    
8969        displayed_buffer = XBUFFER (XWINDOW (selected_window)->buffer);        displayed_buffer = XBUFFER (XWINDOW (selected_window)->buffer);
8970        internal_condition_case_1 (redisplay_window_1, selected_window, Qerror,        /* Use list_of_error, not Qerror, so that
8971             we catch only errors and don't run the debugger.  */
8972          internal_condition_case_1 (redisplay_window_1, selected_window,
8973                                     list_of_error,
8974                                   redisplay_window_error);                                   redisplay_window_error);
8975        
8976        /* Compare desired and current matrices, perform output.  */        /* Compare desired and current matrices, perform output.  */
# Line 9299  redisplay_windows (window) Line 9309  redisplay_windows (window)
9309        else        else
9310          {          {
9311            displayed_buffer = XBUFFER (w->buffer);            displayed_buffer = XBUFFER (w->buffer);
9312            internal_condition_case_1 (redisplay_window_0, window, Qerror,            /* Use list_of_error, not Qerror, so that
9313                 we catch only errors and don't run the debugger.  */
9314              internal_condition_case_1 (redisplay_window_0, window,
9315                                         list_of_error,
9316                                       redisplay_window_error);                                       redisplay_window_error);
9317          }          }
9318    
# Line 14887  syms_of_xdisp () Line 14900  syms_of_xdisp ()
14900    Qobject = intern ("object");    Qobject = intern ("object");
14901    staticpro (&Qobject);    staticpro (&Qobject);
14902    
14903      list_of_error = Fcons (intern ("error"), Qnil);
14904      staticpro (&list_of_error);
14905    
14906    last_arrow_position = Qnil;    last_arrow_position = Qnil;
14907    last_arrow_string = Qnil;    last_arrow_string = Qnil;
14908    staticpro (&last_arrow_position);    staticpro (&last_arrow_position);

Legend:
Removed from v.1.738  
changed lines
  Added in v.1.739

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26