1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4fbf8cee67d..9dd960b50fb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (try_scrolling): Use iterator to find the scroll margin,
+        instead of window-end which does the wrong thing at eob.
+        (try_cursor_movement): Minor optimization.
+        (redisplay_window): If scroll margin is defined, don't assume
+        window doesn't need scrolling.
+
 2008-08-06  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
         * config.in: Regenerate.