Commit e9a49426 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix bug #10192 with assertion violation when scrolling.

 src/xdisp.c (redisplay_window): Don't let `margin' become negative.
 This could happen when scroll-margin is zero and scroll-*-aggressively
 is a small float number.
parent 9e49252b
......@@ -3,6 +3,7 @@
* xdisp.c (handle_invisible_prop): If the invisible text ends just
before a newline, prepare the bidi iterator for consuming the
newline, and keep the current paragraph direction. (Bug#10183)
(redisplay_window): Don't let `margin' become negative. (Bug#10192)
2011-12-02 Juri Linkov <juri@jurta.org>
......
......@@ -15617,7 +15617,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
pt_offset = float_amount * WINDOW_BOX_TEXT_HEIGHT (w);
if (pt_offset == 0 && float_amount > 0)
pt_offset = 1;
if (pt_offset)
if (pt_offset && margin > 0)
margin -= 1;
}
/* Compute how much to move the window start backward from
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment