comparison src/xdisp.c @ 43945:fed6d1639bb4

(redisplay_internal, redisplay_windows): Use list_of_error to call internal_condition_case_1. (safe_eval, safe_call): Pass Qt to internal_condition_case_{1,2} so as to catch all errors with no possibility of debugger redisplay. (list_of_error): New variable. (syms_of_xdisp): Init and staticpro it.

43944:42291dbdcf4b

Lisp_Object QCeval, Qwhen, QCfile, QCdata, QCpropertize;
Lisp_Object Qfontified;
Lisp_Object Qgrow_only;
Lisp_Object Qinhibit_eval_during_redisplay;
Lisp_Object Qbuffer_position, Qposition, Qobject;

/* Functions called to fontify regions of text.  */

Lisp_Object Vfontification_functions;
Lisp_Object Qfontification_functions;

      int count = BINDING_STACK_SIZE ();
      struct gcpro gcpro1;

      GCPRO1 (sexpr);
      specbind (Qinhibit_redisplay, Qt);
      val = internal_condition_case_1 (Feval, sexpr, Qerror,
				       safe_eval_handler);
      UNGCPRO;
      val = unbind_to (count, val);
    }
  

      struct gcpro gcpro1;

      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);
    }

    {
      Lisp_Object mini_window;
      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.  */
    update:
  

      else if (!NILP (w->vchild))
	redisplay_windows (w->vchild);
      else
	{
	  displayed_buffer = XBUFFER (w->buffer);
	  internal_condition_case_1 (redisplay_window_0, window, Qerror,
				     redisplay_window_error);
	}

      window = w->next;
    }

  Qbuffer_position = intern ("buffer-position");
  staticpro (&Qbuffer_position);
  Qobject = intern ("object");
  staticpro (&Qobject);

  last_arrow_position = Qnil;
  last_arrow_string = Qnil;
  staticpro (&last_arrow_position);
  staticpro (&last_arrow_string);
  

43945:fed6d1639bb4

Lisp_Object QCeval, Qwhen, QCfile, QCdata, QCpropertize;
Lisp_Object Qfontified;
Lisp_Object Qgrow_only;
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;
Lisp_Object Qfontification_functions;

      int count = BINDING_STACK_SIZE ();
      struct gcpro gcpro1;

      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);
    }
  

      struct gcpro gcpro1;

      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);
    }

    {
      Lisp_Object mini_window;
      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.  */
    update:
  

      else if (!NILP (w->vchild))
	redisplay_windows (w->vchild);
      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);
	}

      window = w->next;
    }

  Qbuffer_position = intern ("buffer-position");
  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;
  staticpro (&last_arrow_position);
  staticpro (&last_arrow_string);