Fix bug #7474 with cursor positioning in overlay strings.

 xdisp.c (set_cursor_from_row): Don't forget to consider the
 `cursor' property of the first character in overlay strings.

diff --git a/src/ChangeLog b/src/ChangeLog
index ba298d8aa48ede6bff759440ad5050e56c35c963..ce18c71a1cfcef3839f4fdd175ef450e077e18a8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (set_cursor_from_row): Don't forget to consider the
+       `cursor' property of the first character in overlay strings.
+       (Bug#7474)
+
 2010-11-24  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (NSLeftControlKeyMask, NSLeftCommandKeyMask)

diff --git a/src/xdisp.c b/src/xdisp.c
index b2d81cb60e9f275245f114f72a470a88322a1b35..fd80d7a0208a98df2669ec28790880b0b8a76a02 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12943,7 +12943,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
 
                          if (tem)
                            cursor = glyph;
-                         for (glyph += incr;
+                         for ( ;
                               (row->reversed_p ? glyph > stop : glyph < stop)
                                 && EQ (glyph->object, str);
                               glyph += incr)