# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1082144025 0
# Node ID 4f197079409ce0155c67ffb92baa1739b34aff8c
# Parent  8a977dfc791a1576434dfbfe43fe2e9d190cc0cf
*** empty log message ***

diff -r 8a977dfc791a -r 4f197079409c src/ChangeLog
--- a/src/ChangeLog	Fri Apr 16 19:32:23 2004 +0000
+++ b/src/ChangeLog	Fri Apr 16 19:33:45 2004 +0000
@@ -1,3 +1,8 @@
+2004-04-16  Juanma Barranquero  <lektu@terra.es>
+
+	* xdisp.c (try_scrolling): Make sure `scroll-conservatively' is
+	not too large before computing how much to scroll.
+
 2004-04-14  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* fileio.c (Fverify_visited_file_modtime, Fvisited_file_modtime):