# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 971706157 0
# Node ID 3c3fa768e7d1fd8e36ea9f6bac38fc5df8153f67
# Parent  4df77b11080e57e5072a608305fd4154ce10efdf
*** empty log message ***

diff -r 4df77b11080e -r 3c3fa768e7d1 man/ChangeLog
--- a/man/ChangeLog	Mon Oct 16 14:22:29 2000 +0000
+++ b/man/ChangeLog	Mon Oct 16 14:22:37 2000 +0000
@@ -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 -r 4df77b11080e -r 3c3fa768e7d1 src/ChangeLog
--- a/src/ChangeLog	Mon Oct 16 14:22:29 2000 +0000
+++ b/src/ChangeLog	Mon Oct 16 14:22:37 2000 +0000
@@ -1,5 +1,11 @@
+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.