1 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cb4aad6ec95..e328afcde8f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2015-03-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (handle_invisible_prop): Fix up it->position even when
+        we are going to load overlays at the beginning of the invisible
+        text.
+        (setup_for_ellipsis): Reset the ignore_overlay_strings_at_pos_p
+        flag also here.
+        (next_overlay_string): Set the overlay_strings_at_end_processed_p
+        flag only if the overlays just processed were actually loaded at
+        EOB.
+
 2015-03-14  Daniel Colascione  <dancol@dancol.org>
 
         * emacs.c (standard_args): Add --no-x-resources.