emacs-diffs
[Top][All Lists]
Advanced

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

master 391acd9134: Fix assertion violation when 'max-redisplay-ticks' is


From: Eli Zaretskii
Subject: master 391acd9134: Fix assertion violation when 'max-redisplay-ticks' is set too low
Date: Fri, 24 Jun 2022 07:15:51 -0400 (EDT)

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

    Fix assertion violation when 'max-redisplay-ticks' is set too low
    
    * src/xdisp.c (update_redisplay_ticks): Disable 'scrolling_window'
    optimization in 'update_window' when redisplay of a window is
    aborted.  (Bug#56184)
---
 src/xdisp.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/xdisp.c b/src/xdisp.c
index 2e3711a20d..c37a58ab4e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17250,6 +17250,11 @@ update_redisplay_ticks (int ticks, struct window *w)
           : (char *) "<unknown>");
 
       windows_or_buffers_changed = 177;
+      /* scrolling_window depends too much on the glyph matrices being
+        correct, and we cannot guarantee that if we abort the
+        redisplay of this window.  */
+      if (w && w->desired_matrix)
+       w->desired_matrix->no_scrolling_p = true;
       error ("Window showing buffer %s takes too long to redisplay", bufname);
     }
 }



reply via email to

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