Show warnings about aborted redisplay

* src/xdisp.c (redisplay_window_error): Show messages about
aborted redisplay of a window as delayed-warnings.

diff --git a/src/xdisp.c b/src/xdisp.c
index f95aeb6149a5ab84f620e70c12d56ccd55e258f9..e9dcdd72333949b21fbe973cd9120aace3e3d051 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17161,9 +17161,19 @@ redisplay_windows (Lisp_Object window)
 }
 
 static Lisp_Object
-redisplay_window_error (Lisp_Object ignore)
+redisplay_window_error (Lisp_Object error_data)
 {
   displayed_buffer->display_error_modiff = BUF_MODIFF (displayed_buffer);
+
+  /* When in redisplay, the error is captured and not shown.  Arrange
+     for it to be shown later.  */
+  if (max_redisplay_ticks > 0
+      && CONSP (error_data)
+      && EQ (XCAR (error_data), Qerror)
+      && STRINGP (XCAR (XCDR (error_data))))
+    Vdelayed_warnings_list = Fcons (list2 (XCAR (error_data),
+                                          XCAR (XCDR (error_data))),
+                                   Vdelayed_warnings_list);
   return Qnil;
 }