Commit ca839c85 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(merge_face_heights): Use safe_call instead of

call_function.
parent 116d6f5c
2000-10-05 Gerd Moellmann <gerd@gnu.org>
* keyboard.c (Frecursive_edit): Make sure redisplay can happen.
* xdisp.c (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.
* xfaces.c (merge_face_heights): Use safe_call instead of
call_function.
* keyboard.c (show_help_echo): Use safe_call instead of
call_function; use safe_eval instead of eval_form.
* lisp.h (safe_call): Renamed from call_function.
(safe_eval): Renamed from eval_form.
(safe_call1): Add prototype.
2000-10-05 Miles Bader <miles@lsi.nec.co.jp> 2000-10-05 Miles Bader <miles@lsi.nec.co.jp>
* xfns.c (image_ascent): Rearrange ascent calculation for the * xfns.c (image_ascent): Rearrange ascent calculation for the
......
...@@ -3099,7 +3099,7 @@ merge_face_heights (from, to, invalid, gcpro) ...@@ -3099,7 +3099,7 @@ merge_face_heights (from, to, invalid, gcpro)
args[0] = from; args[0] = from;
args[1] = to; args[1] = to;
height = call_function (2, args); height = safe_call (2, args);
UNGCPRO; UNGCPRO;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment