procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #10192 with assertion violation when scrolling.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2011-12-03 11:55:27 +02:00
parent 9e49252b2d
commit e9a494263c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/ChangeLog
View file

@ -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>

2
src/xdisp.c
View file

@ -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