[Emacs-diffs] Changes to emacs/src/xdisp.c

[Richard M. Stallman]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.738 emacs/src/xdisp.c:1.739
*** emacs/src/xdisp.c:1.738     Wed Mar 13 09:16:15 2002
--- emacs/src/xdisp.c   Sat Mar 16 02:05:59 2002
***************
*** 226,231 ****
--- 226,234 ----
  Lisp_Object Qinhibit_eval_during_redisplay;
  Lisp_Object Qbuffer_position, Qposition, Qobject;
  
+ /* Holds the list (error).  */
+ Lisp_Object list_of_error;
+ 
  /* Functions called to fontify regions of text.  */
  
  Lisp_Object Vfontification_functions;
***************
*** 1323,1329 ****
  
        GCPRO1 (sexpr);
        specbind (Qinhibit_redisplay, Qt);
!       val = internal_condition_case_1 (Feval, sexpr, Qerror,
                                       safe_eval_handler);
        UNGCPRO;
        val = unbind_to (count, val);
--- 1326,1334 ----
  
        GCPRO1 (sexpr);
        specbind (Qinhibit_redisplay, Qt);
!       /* Use Qt to ensure debugger does not run,
!        so there is no possibility of wanting to redisplay.  */
!       val = internal_condition_case_1 (Feval, sexpr, Qt,
                                       safe_eval_handler);
        UNGCPRO;
        val = unbind_to (count, val);
***************
*** 1354,1360 ****
        GCPRO1 (args[0]);
        gcpro1.nvars = nargs;
        specbind (Qinhibit_redisplay, Qt);
!       val = internal_condition_case_2 (Ffuncall, nargs, args, Qerror,
                                       safe_eval_handler);
        UNGCPRO;
        val = unbind_to (count, val);
--- 1359,1367 ----
        GCPRO1 (args[0]);
        gcpro1.nvars = nargs;
        specbind (Qinhibit_redisplay, Qt);
!       /* Use Qt to ensure debugger does not run,
!        so there is no possibility of wanting to redisplay.  */
!       val = internal_condition_case_2 (Ffuncall, nargs, args, Qt,
                                       safe_eval_handler);
        UNGCPRO;
        val = unbind_to (count, val);
***************
*** 8960,8966 ****
        struct frame *mini_frame;
  
        displayed_buffer = XBUFFER (XWINDOW (selected_window)->buffer);
!       internal_condition_case_1 (redisplay_window_1, selected_window, Qerror,
                                 redisplay_window_error);
    
        /* Compare desired and current matrices, perform output.  */
--- 8967,8976 ----
        struct frame *mini_frame;
  
        displayed_buffer = XBUFFER (XWINDOW (selected_window)->buffer);
!       /* Use list_of_error, not Qerror, so that
!        we catch only errors and don't run the debugger.  */
!       internal_condition_case_1 (redisplay_window_1, selected_window,
!                                list_of_error,
                                 redisplay_window_error);
    
        /* Compare desired and current matrices, perform output.  */
***************
*** 9299,9305 ****
        else
        {
          displayed_buffer = XBUFFER (w->buffer);
!         internal_condition_case_1 (redisplay_window_0, window, Qerror,
                                     redisplay_window_error);
        }
  
--- 9309,9318 ----
        else
        {
          displayed_buffer = XBUFFER (w->buffer);
!         /* Use list_of_error, not Qerror, so that
!            we catch only errors and don't run the debugger.  */
!         internal_condition_case_1 (redisplay_window_0, window, 
!                                    list_of_error,
                                     redisplay_window_error);
        }
  
***************
*** 14886,14891 ****
--- 14899,14907 ----
    staticpro (&Qbuffer_position);
    Qobject = intern ("object");
    staticpro (&Qobject);
+ 
+   list_of_error = Fcons (intern ("error"), Qnil);
+   staticpro (&list_of_error);
  
    last_arrow_position = Qnil;
    last_arrow_string = Qnil;