*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 920e609444ea5a05388dc2aa08d6d6e52f5e8cd2..99a771fc4151bef7c0c40fbb9d7759989aac873a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index e8abc2970c985ecab272304158e404d75f216035..4ba3ced9541a061a057f4250e365fdd89ce591dc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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