emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master b89b23079c 12/14: Show warnings about aborted redisplay


From: Eli Zaretskii
Subject: master b89b23079c 12/14: Show warnings about aborted redisplay
Date: Fri, 24 Jun 2022 03:54:19 -0400 (EDT)

branch: master
commit b89b23079cba00113fbc8b658a07e884392ff3a1
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Show warnings about aborted redisplay
    
    * src/xdisp.c (redisplay_window_error): Show messages about
    aborted redisplay of a window as delayed-warnings.
---
 src/xdisp.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index f95aeb6149..e9dcdd7233 100644
--- 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;
 }
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]