From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 16 Oct 2000 14:22:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~839
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b41fe2c315335c74d73d73116260fdd613132460;p=emacs.git

*** empty log message ***
---

diff --git a/man/ChangeLog b/man/ChangeLog
index ae2d6102d51..523eb508afb 100644
--- 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 aa3ad9e4566..043e46471c2 100644
--- 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.