diff options
| author | Eli Zaretskii | 2018-08-02 16:58:44 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2018-08-02 16:58:44 +0300 |
| commit | f0b8e64fb7720a9376bde80cc59fe37b0df83b9d (patch) | |
| tree | c2c4a3d63d643e861da6d31e60efb626757e828c | |
| parent | 7669bf7880e54aae7036a1b62db3693c2f627649 (diff) | |
| download | emacs-f0b8e64fb7720a9376bde80cc59fe37b0df83b9d.tar.gz emacs-f0b8e64fb7720a9376bde80cc59fe37b0df83b9d.zip | |
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)
| -rw-r--r-- | src/xdisp.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) | |||
| 16897 | /* We used to issue a CHECK_MARGINS argument to try_window here, | 16897 | /* We used to issue a CHECK_MARGINS argument to try_window here, |
| 16898 | but this causes scrolling to fail when point begins inside | 16898 | but this causes scrolling to fail when point begins inside |
| 16899 | the scroll margin (bug#148) -- cyd */ | 16899 | the scroll margin (bug#148) -- cyd */ |
| 16900 | clear_glyph_matrix (w->desired_matrix); | ||
| 16900 | if (!try_window (window, startp, 0)) | 16901 | if (!try_window (window, startp, 0)) |
| 16901 | { | 16902 | { |
| 16902 | w->force_start = true; | 16903 | w->force_start = true; |