comparison src/xdisp.c @ 32175:e5d99e8cbd94

(handle_single_display_prop): Use safe_call1. (safe_call): Renamed from call_function. (safe_call1): New function. (handle_fontified_prop): Use safe_call1 instead of call1. (safe_eval): Renamed from eval_form. (safe_eval_handler): Renamed from eval_handler. (handle_single_display_prop, display_mode_element): Use safe_eval instead of eval_form.

32174:13415f4f854a

static Lisp_Object unwind_redisplay P_ ((Lisp_Object));
static int string_char_and_length P_ ((unsigned char *, int, int *));
static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object,
					     struct text_pos));
static int compute_window_start_on_continuation_line P_ ((struct window *));
static Lisp_Object eval_handler P_ ((Lisp_Object));
static void insert_left_trunc_glyphs P_ ((struct it *));
static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *));
static void extend_face_to_end_of_line P_ ((struct it *));
static int append_space P_ ((struct it *, int));
static void make_cursor_line_fully_visible P_ ((struct window *));


/***********************************************************************
			Lisp form evaluation
 ***********************************************************************/

/* Error handler for eval_form and call_function.  */

static Lisp_Object
eval_handler (arg)
     Lisp_Object arg;
{
  return Qnil;
}


/* Evaluate SEXPR and return the result, or nil if something went
   wrong.  */

Lisp_Object
eval_form (sexpr)
     Lisp_Object sexpr;
{
  int count = specpdl_ptr - specpdl;
  struct gcpro gcpro1;
  Lisp_Object val;

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


/* Call function ARGS[0] with arguments ARGS[1] to ARGS[NARGS - 1].
   Return the result, or nil if something went wrong.  */

Lisp_Object
call_function (nargs, args)
     int nargs;
     Lisp_Object *args;
{
  int count = specpdl_ptr - specpdl;
  Lisp_Object val;

  GCPRO1 (args[0]);
  gcpro1.nvars = nargs;
  specbind (Qinhibit_redisplay, Qt);
  val = internal_condition_case_2 (Ffuncall, nargs, args, Qerror,
				   eval_handler);
  UNGCPRO;
  return unbind_to (count, val);
}



/***********************************************************************

      val = Vfontification_functions;
      specbind (Qfontification_functions, Qnil);
      specbind (Qafter_change_functions, Qnil);
  
      if (!CONSP (val) || EQ (XCAR (val), Qlambda))
	call1 (val, pos);
      else
	{
	  Lisp_Object globals, fn;
	  struct gcpro gcpro1, gcpro2;

		       CONSP (globals);
		       globals = XCDR (globals))
		    {
		      fn = XCAR (globals);
		      if (!EQ (fn, Qt))
			call1 (fn, pos);
		    }
		}
	      else
		call1 (fn, pos);
	    }

	  UNGCPRO;
	}

	  CHARPOS (pt) = PT;
	  BYTEPOS (pt) = PT_BYTE;
	  TEMP_SET_PT_BOTH (CHARPOS (end_pos), BYTEPOS (end_pos));
	}
      
      form = eval_form (form);
      
      if (BUFFERP (object))
	TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
      UNGCPRO;  
    }

	    }
	  else if (FUNCTIONP (it->font_height))
	    {
	      /* Call function with current height as argument.
		 Value is the new height.  */
	      Lisp_Object args[2], height;
	      
	      args[0] = it->font_height;
	      args[1] = face->lface[LFACE_HEIGHT_INDEX];
	      height = call_function (2, args);
	      
	      if (NUMBERP (height))
		new_height = XFLOATINT (height);
	    }
	  else if (NUMBERP (it->font_height))
	    {

		 current specified height to get the new height.  */
	      Lisp_Object value;
	      int count = specpdl_ptr - specpdl;
	      
	      specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
	      value = eval_form (it->font_height);
	      unbind_to (count, Qnil);
	      
	      if (NUMBERP (value))
		new_height = XFLOATINT (value);
	    }

	    /* An element of the form (:eval FORM) means evaluate FORM
	       and use the result as mode line elements.  */
	    struct gcpro gcpro1;
	    Lisp_Object spec;

	    spec = eval_form (XCAR (XCDR (elt)));
	    GCPRO1 (spec);
	    n += display_mode_element (it, depth, field_width - n,
				       precision - n, spec);
	    UNGCPRO;
	  }

32175:e5d99e8cbd94

static Lisp_Object unwind_redisplay P_ ((Lisp_Object));
static int string_char_and_length P_ ((unsigned char *, int, int *));
static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object,
					     struct text_pos));
static int compute_window_start_on_continuation_line P_ ((struct window *));
static Lisp_Object safe_eval_handler P_ ((Lisp_Object));
static void insert_left_trunc_glyphs P_ ((struct it *));
static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *));
static void extend_face_to_end_of_line P_ ((struct it *));
static int append_space P_ ((struct it *, int));
static void make_cursor_line_fully_visible P_ ((struct window *));


/***********************************************************************
			Lisp form evaluation
 ***********************************************************************/

/* Error handler for safe_eval and safe_call.  */

static Lisp_Object
safe_eval_handler (arg)
     Lisp_Object arg;
{
  return Qnil;
}


/* Evaluate SEXPR and return the result, or nil if something went
   wrong.  */

Lisp_Object
safe_eval (sexpr)
     Lisp_Object sexpr;
{
  int count = specpdl_ptr - specpdl;
  struct gcpro gcpro1;
  Lisp_Object val;

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


/* Call function ARGS[0] with arguments ARGS[1] to ARGS[NARGS - 1].
   Return the result, or nil if something went wrong.  */

Lisp_Object
safe_call (nargs, args)
     int nargs;
     Lisp_Object *args;
{
  int count = specpdl_ptr - specpdl;
  Lisp_Object val;

  GCPRO1 (args[0]);
  gcpro1.nvars = nargs;
  specbind (Qinhibit_redisplay, Qt);
  val = internal_condition_case_2 (Ffuncall, nargs, args, Qerror,
				   safe_eval_handler);
  UNGCPRO;
  return unbind_to (count, val);
}


/* Call function FN with one argument ARG.
   Return the result, or nil if something went wrong.  */

Lisp_Object
safe_call1 (fn, arg)
     Lisp_Object fn, arg;
{
  Lisp_Object args[2];
  args[0] = fn;
  args[1] = arg;
  return safe_call (2, args);
}



/***********************************************************************

      val = Vfontification_functions;
      specbind (Qfontification_functions, Qnil);
      specbind (Qafter_change_functions, Qnil);
  
      if (!CONSP (val) || EQ (XCAR (val), Qlambda))
	safe_call1 (val, pos);
      else
	{
	  Lisp_Object globals, fn;
	  struct gcpro gcpro1, gcpro2;

		       CONSP (globals);
		       globals = XCDR (globals))
		    {
		      fn = XCAR (globals);
		      if (!EQ (fn, Qt))
			safe_call1 (fn, pos);
		    }
		}
	      else
		safe_call1 (fn, pos);
	    }

	  UNGCPRO;
	}

	  CHARPOS (pt) = PT;
	  BYTEPOS (pt) = PT_BYTE;
	  TEMP_SET_PT_BOTH (CHARPOS (end_pos), BYTEPOS (end_pos));
	}
      
      form = safe_eval (form);
      
      if (BUFFERP (object))
	TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
      UNGCPRO;  
    }

	    }
	  else if (FUNCTIONP (it->font_height))
	    {
	      /* Call function with current height as argument.
		 Value is the new height.  */
	      Lisp_Object height;
	      height = safe_call1 (it->font_height,
				   face->lface[LFACE_HEIGHT_INDEX]);
	      if (NUMBERP (height))
		new_height = XFLOATINT (height);
	    }
	  else if (NUMBERP (it->font_height))
	    {

		 current specified height to get the new height.  */
	      Lisp_Object value;
	      int count = specpdl_ptr - specpdl;
	      
	      specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
	      value = safe_eval (it->font_height);
	      unbind_to (count, Qnil);
	      
	      if (NUMBERP (value))
		new_height = XFLOATINT (value);
	    }

	    /* An element of the form (:eval FORM) means evaluate FORM
	       and use the result as mode line elements.  */
	    struct gcpro gcpro1;
	    Lisp_Object spec;

	    spec = safe_eval (XCAR (XCDR (elt)));
	    GCPRO1 (spec);
	    n += display_mode_element (it, depth, field_width - n,
				       precision - n, spec);
	    UNGCPRO;
	  }