[Emacs-diffs] /srv/bzr/emacs/trunk r102512: Fix bug #7474 with cursor positioning in overlay strings.

[Eli Zaretskii]

------------------------------------------------------------
revno: 102512
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2010-11-25 20:38:09 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-24 14:52:14 +0000
+++ b/src/ChangeLog     2010-11-25 18:38:09 +0000
@@ -1,3 +1,9 @@
+2010-11-25  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsterm.m (NSLeftControlKeyMask, NSLeftCommandKeyMask)

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-11-19 16:34:22 +0000
+++ b/src/xdisp.c       2010-11-25 18:38:09 +0000
@@ -12943,7 +12943,7 @@
 
                          if (tem)
                            cursor = glyph;
-                         for (glyph += incr;
+                         for ( ;
                               (row->reversed_p ? glyph > stop : glyph < stop)
                                 && EQ (glyph->object, str);
                               glyph += incr)