From 5d36f2227f1d9eaf6c08b26ad889c3ae343c3580 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 5 Nov 2017 20:10:38 +0200 Subject: [PATCH] Fix last change in hscroll_window_tree * src/xdisp.c (hscroll_window_tree): When hscroll suspension is being disabled, set the frame's garbaged flag less eagerly. (Bug#29002) --- src/xdisp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index baf075b1c8e..69b74dc6298 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13179,9 +13179,14 @@ hscroll_window_tree (Lisp_Object window) Fwindow_old_point (window)))) { w->suspend_auto_hscroll = false; - /* Force thorough redisplay of this window, to show the - effect of disabling hscroll suspension immediately. */ - SET_FRAME_GARBAGED (XFRAME (w->frame)); + /* When hscrolling just the current line, and the rest + of lines were temporarily hscrolled, but no longer + are, force thorough redisplay of this window, to show + the effect of disabling hscroll suspension immediately. */ + if (w->min_hscroll == 0 && w->hscroll > 0 + && EQ (Fbuffer_local_value (Qauto_hscroll_mode, w->contents), + Qcurrent_line)) + SET_FRAME_GARBAGED (XFRAME (w->frame)); } /* Remember window point. */ -- 2.39.5