1 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e5962fa8fed..09ac0d78e73 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_line): Record maximum and minimum buffer
+        positions even if no glyphs were produced (e.g., by a zero-width
+        stretch).  Fixes bug#9530 on a TTY.  Under word-wrap, don't record
+        buffer positions that will be removed from the glyph row because
+        they don't fit.
+
 2011-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * xdisp.c (expose_window): Save original value of phys_cursor_on_p