From cad9d76e12a32c5ca752ce0cfd521a6faa29067b Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sat, 26 Mar 2016 14:43:25 +0100 Subject: [PATCH] Safely run window size change functions * src/window.c (run_window_size_change_functions): Use safe_call1 when running a size change function. (grow_mini_window, shrink_mini_window): Report error when minibuffer window cannot be resized. --- src/window.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/window.c b/src/window.c index 77a43b739ce..8c76c1f9975 100644 --- a/src/window.c +++ b/src/window.c @@ -3319,7 +3319,7 @@ run_window_size_change_functions (Lisp_Object frame) while (CONSP (functions)) { if (!EQ (XCAR (functions), Qt)) - call1 (XCAR (functions), frame); + safe_call1 (XCAR (functions), frame); functions = XCDR (functions); } @@ -4619,6 +4619,9 @@ grow_mini_window (struct window *w, int delta, bool pixelwise) adjust_frame_glyphs (f); unblock_input (); } + else + error ("Failed to grow minibuffer window"); + } } @@ -4662,6 +4665,8 @@ shrink_mini_window (struct window *w, bool pixelwise) one window frame here. The same routine will be needed when shrinking the frame (and probably when making the initial *scratch* window). For the moment leave things as they are. */ + else + error ("Failed to shrink minibuffer window"); } } -- 2.11.4.GIT