diff options
| author | Eli Zaretskii | 2011-12-03 11:55:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-12-03 11:55:27 +0200 |
| commit | e9a494263ca8d8e39373597ebf432ee001d62e21 (patch) | |
| tree | b62516ae994d2584bc684936a2e029e216ae8493 /src/ChangeLog | |
| parent | 9e49252b2d8fe1a3f078ec0342df0008cea5059e (diff) | |
| download | emacs-e9a494263ca8d8e39373597ebf432ee001d62e21.tar.gz emacs-e9a494263ca8d8e39373597ebf432ee001d62e21.zip | |
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.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index efba68d99d6..61b44593062 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * xdisp.c (handle_invisible_prop): If the invisible text ends just | 3 | * xdisp.c (handle_invisible_prop): If the invisible text ends just |
| 4 | before a newline, prepare the bidi iterator for consuming the | 4 | before a newline, prepare the bidi iterator for consuming the |
| 5 | newline, and keep the current paragraph direction. (Bug#10183) | 5 | newline, and keep the current paragraph direction. (Bug#10183) |
| 6 | (redisplay_window): Don't let `margin' become negative. (Bug#10192) | ||
| 6 | 7 | ||
| 7 | 2011-12-02 Juri Linkov <juri@jurta.org> | 8 | 2011-12-02 Juri Linkov <juri@jurta.org> |
| 8 | 9 | ||