1. Nic Ferrier
  2. emacs

Commits

Eli Zaretskii  committed 4633dbb

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.

  • Participants
  • Parent commits e48aa61
  • Branches default

Comments (0)

Files changed (2)

File src/ChangeLog

View file
  • Ignore whitespace
 	* 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>
 

File src/xdisp.c

View file
  • Ignore whitespace
 	      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