From: Eli Zaretskii Date: Thu, 2 Aug 2018 13:58:44 +0000 (+0300) Subject: Avoid assertion violations in maybe_produce_line_number X-Git-Tag: emacs-26.1.90~222 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0b8e64fb7720a9376bde80cc59fe37b0df83b9d;p=emacs.git Avoid assertion violations in maybe_produce_line_number * src/xdisp.c (redisplay_window): Make sure desired_matrix is cleared before calling try_window. This is important when display-line-numbers is non-nil, because line-number display code assumes each glyph row is completely cleared when it is called to produce a line number. (Bug#32358) --- diff --git a/src/xdisp.c b/src/xdisp.c index 9247d5bc3e1..9a82953952f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -16897,6 +16897,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p) /* We used to issue a CHECK_MARGINS argument to try_window here, but this causes scrolling to fail when point begins inside the scroll margin (bug#148) -- cyd */ + clear_glyph_matrix (w->desired_matrix); if (!try_window (window, startp, 0)) { w->force_start = true;