* xdisp.c (redisplay_window): Revert last change.

(try_window): Check bottom scroll margin too.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a95dff542892a8dd5509e0001df959ad79d178d..d1bd1e3b488ab53aaec2d3c51c5e2550d490c034 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xdisp.c (redisplay_window): Revert last change.
+       (try_window): Check bottom scroll margin too.
+
 2008-08-06  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
        * config.in: Regenerate.