diff src/ChangeLog @ 108103:01ca94871a56

Fix cursor motion at end of line that ends in a composed character. 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.

--- a/src/ChangeLog	Sat Apr 24 10:36:27 2010 +0300
+++ b/src/ChangeLog	Sat Apr 24 14:11:40 2010 +0300
@@ -1,6 +1,11 @@
 2010-04-24  Eli Zaretskii  <[e-mail]>
 
-	* .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  <[e-mail]>
@@ -55,6 +60,10 @@
 
 	Support `display' text properties and overlay strings in bidi
 	buffers.
+=======
[phone]  Eli Zaretskii  <[e-mail]>
+
+>>>>>>> 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)