summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-12-20 15:36:56 +0000
committerGerd Moellmann <gerd@gnu.org>2000-12-20 15:36:56 +0000
commit3172f70b5186d88bd4bb12da05dcf15a172c631a (patch)
treef9318a7ef1b8caef358e4054165314ad15131e21 /src/xdisp.c
parentea68264b3a95bb010cbfb6a5724d797caef07b48 (diff)
downloademacs-3172f70b5186d88bd4bb12da05dcf15a172c631a.tar.gz
(hscroll_window_tree): Take window's min_hscroll
into account.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index e72ca02e6e6..3f8f5d762bf 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7601,13 +7601,15 @@ hscroll_window_tree (window)
/* Center cursor in window. */
hscroll = (max (0, it.current_x - text_area_width / 2)
/ CANON_X_UNIT (it.f));
+ hscroll = max (hscroll, XFASTINT (w->min_hscroll));
/* Don't call Fset_window_hscroll if value hasn't
changed because it will prevent redisplay
optimizations. */
if (XFASTINT (w->hscroll) != hscroll)
{
- Fset_window_hscroll (window, make_number (hscroll));
+ XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
+ w->hscroll = make_number (hscroll);
hscrolled_p = 1;
}
}