# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1082143943 0
# Node ID 8a977dfc791a1576434dfbfe43fe2e9d190cc0cf
# Parent  07f4773453a09ffa01c8fcbbe1f73a1327e8d1b8
(try_scrolling): Make sure `scroll-conservatively' is not too large before
computing how much to scroll.

diff -r 07f4773453a0 -r 8a977dfc791a src/xdisp.c
--- 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)