1 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index faa2a104337..906d17535c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (pos_visible_p): If the window start position is beyond
+        ZV, start the display from buffer beginning.  Prevents assertion
+        violation in init_iterator when the minibuffer window is scrolled
+        via the scroll bar.
+
+        * window.c (window_scroll_pixel_based): Likewise.
+
 2012-04-23  Chong Yidong  <cyd@gnu.org>
 
         * keymap.c (where_is_internal): Doc fix (Bug#10872).