From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 24 Jun 2022 11:14:41 +0000 (+0300)
Subject: Fix assertion violation when 'max-redisplay-ticks' is set too low
X-Git-Tag: emacs-29.0.90~1447^2~1493
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=391acd91344c833d94d89b2862b272d08643c068;p=emacs.git

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)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 2e3711a20d8..c37a58ab4e1 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);
     }
 }