[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;
}
- Re: master e1e0315252 01/14: Initial implementation of "abort-redisplay" feature, (continued)
master f1e1392868 03/14: Change the API of 'update_redisplay_ticks', Eli Zaretskii, 2022/06/24
master 82626e62ab 08/14: Allow aborting redisplay stuck in 'parse-partial-sexp', Eli Zaretskii, 2022/06/24
master a82af5ae78 09/14: Don't count ticks too eagerly in syntax.c, Eli Zaretskii, 2022/06/24
master 5a596bbed5 02/14: Fix a typo in a doc string., Eli Zaretskii, 2022/06/24
master bd44f39d6d 04/14: Restart tick counting every command, Eli Zaretskii, 2022/06/24
master 264472a507 05/14: Handle W = NULL in 'update_redisplay_ticks', Eli Zaretskii, 2022/06/24
master b89b23079c 12/14: Show warnings about aborted redisplay,
Eli Zaretskii <=
master 287e714fe0 11/14: Update redisplay ticks for more operations, and misc modifications, Eli Zaretskii, 2022/06/24
master 94e1185369 06/14: Support callers which sometimes run unrelated to display code, Eli Zaretskii, 2022/06/24
master 94672c2936 07/14: Handle too long syntactic fontifications, Eli Zaretskii, 2022/06/24
master 4b00bc47c7 10/14: Update documentation, Eli Zaretskii, 2022/06/24
master 289b457cac 14/14: Merge branch 'abort-redisplay', Eli Zaretskii, 2022/06/24
master 6fcd8ca743 13/14: ; * etc/NEWS: Minor update of description of 'max-redisplay-ticks'., Eli Zaretskii, 2022/06/24