*** empty log message ***

diff --git a/man/ChangeLog b/man/ChangeLog
index ae2d6102d515ef9e19bc293f1454c9c97769a219..523eb508afb74d1fbd889177473382619646021d 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-16  Gerd Moellmann  <gerd@gnu.org>
+
+       * sending.texi (Distracting NSA): Change the example.
+
 2000-10-13  John Wiegley  <johnw@gnu.org>
 
        * eshell.texi (Installation): Changed URL reference for where to

diff --git a/src/ChangeLog b/src/ChangeLog
index aa3ad9e456631d552a50b4e0b566dffa6b083754..043e46471c2accdec9ef2e51e852e79b87df02f4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
-2000-10-16  Miles Bader  <miles@gnu.org>
+2000-10-16  Gerd Moellmann  <gerd@gnu.org>
+       
+       * xdisp.c (try_scrolling) <cursor in scroll margin at the bottom>:
+       Don't add in the last line's height when deciding if the new
+       position is below the scroll margin.
 
+2000-10-16  Miles Bader  <miles@gnu.org>
+       
        * xfns.c (xpm_lookup_color): Make h unsigned to avoid wackiness
        when the high bit gets set.