# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 974230259 0
# Node ID 6c0cd7e2d92d93f7b1107c0737bd174fbe8161f5
# Parent  23d500c811182af2a9f9d19aa070e1d9db851bef
*** empty log message ***

diff -r 23d500c81118 -r 6c0cd7e2d92d lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 14 19:30:53 2000 +0000
+++ b/lisp/ChangeLog	Tue Nov 14 19:30:59 2000 +0000
@@ -1,5 +1,7 @@
 2000-11-14  Stefan Monnier  <monnier@cs.yale.edu>
 
+	* progmodes/compile.el (grep): `tag-default' can be nil.
+
 	* newcomment.el (comment-indent): Paren typo.
 
 2000-11-14  Dave Love  <fx@gnu.org>
diff -r 23d500c81118 -r 6c0cd7e2d92d src/ChangeLog
--- a/src/ChangeLog	Tue Nov 14 19:30:53 2000 +0000
+++ b/src/ChangeLog	Tue Nov 14 19:30:59 2000 +0000
@@ -1,3 +1,12 @@
+2000-11-14  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* xdisp.c (try_scrolling): Set scroll_max to max of scroll_* args
+	so setting scroll-step to 1 doesn't defeat scroll-conservatively.
+	Set amount_to_scroll to max of dx and scroll_step so that
+	scroll-conservatively doesn't defeat scroll-step>1.
+	(syms_of_xdisp): Add a hint in scroll-step's docstring to use
+	scroll-conservatively for line-at-a-time scrolling.
+
 2000-11-14  Gerd Moellmann  <gerd@gnu.org>
 
 	* window.c (Fpos_visible_in_window_p): Call pos_visible with