summaryrefslogtreecommitdiff
path: root/src/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c
index 8f889585582..33a1b8a4bf4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1275,7 +1275,10 @@ set_window_hscroll (struct window *w, EMACS_INT hscroll)
/* Prevent redisplay shortcuts when changing the hscroll. */
if (w->hscroll != new_hscroll)
- XBUFFER (w->contents)->prevent_redisplay_optimizations_p = true;
+ {
+ XBUFFER (w->contents)->prevent_redisplay_optimizations_p = true;
+ wset_redisplay (w);
+ }
w->hscroll = new_hscroll;
w->suspend_auto_hscroll = true;
@@ -6684,7 +6687,7 @@ and redisplay normally--don't erase and redraw the frame. */)
considered to be part of the visible height of the line.
*/
h += extra_line_spacing;
- while (-it.current_y > h)
+ while (-it.current_y > h && it.what != IT_EOB)
move_it_by_lines (&it, 1);
charpos = IT_CHARPOS (it);