[Emacs-diffs] /srv/bzr/emacs/trunk r106588: Fix bug #10192 with assertion violation when scrolling.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106588
fixes bug(s): http://debbugs.gnu.org/10192
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-12-03 11:55:27 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-03 07:59:23 +0000
+++ b/src/ChangeLog     2011-12-03 09:55:27 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-12-03 07:59:23 +0000
+++ b/src/xdisp.c       2011-12-03 09:55:27 +0000
@@ -15617,7 +15617,7 @@
              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