1 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 033a32a0a58..7979e809a9d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,11 @@
 2010-04-24  Eli Zaretskii  <eliz@gnu.org>
 
-        * .gdbinit: Add a "set Fmake_symbol" line to force GDB load the
+        * xdisp.c (display_line): Use `reseat' instead of `reseat_1', and
+        use `get_next_display_element' and `set_iterator_to_next' to
+        advance to the next character, when looking for the character that
+        begins the next row.
+
+        * .gdbinit: Add a "set Fmake_symbol" line to force GDB to load the
         definition of "struct Lisp_Symbol".
 
 2010-04-24  Glenn Morris  <rgm@gnu.org>
@@ -55,6 +60,10 @@
 
         Support `display' text properties and overlay strings in bidi
         buffers.
+=======
+2010-04-23  Eli Zaretskii  <eliz@gnu.org>
+
+>>>>>>> MERGE-SOURCE
         * xdisp.c (pop_it): When the stack is popped after displaying
         from a string, bidi-iterate to exit from the text portion covered
         by the `display' property or overlay.  (Bug#5988, bug#5920)