changeset 54917:8a977dfc791a

(try_scrolling): Make sure `scroll-conservatively' is not too large before computing how much to scroll.
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 16 Apr 2004 19:32:23 +0000
parents 07f4773453a0
children 4f197079409c
files src/xdisp.c
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Fri Apr 16 16:42:36 2004 +0000
+++ b/src/xdisp.c	Fri Apr 16 19:32:23 2004 +0000
@@ -10879,6 +10879,12 @@
   else
     this_scroll_margin = 0;
 
+  /* Force scroll_conservatively to have a reasonable value so it doesn't
+     cause an overflow while computing how much to scroll.  */
+  if (scroll_conservatively)
+    scroll_conservatively = min (scroll_conservatively,
+                                 MOST_POSITIVE_FIXNUM / FRAME_LINE_HEIGHT (f));
+
   /* Compute how much we should try to scroll maximally to bring point
      into view.  */
   if (scroll_step || scroll_conservatively || temp_scroll_step)