Fix bug #6687 with cursor positioning after before-string from overlays.

 xdisp.c (set_cursor_from_row): Display cursor after all the
 glyphs that come from an overlay.  Don't overstep the last glyph
 when skipping glyphs from an overlay.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c113a35a777d8fd92eee0f292c3f30b39e98a5f..21e74725dc0f60d249a3cf4f1b989ff1698ae80e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-19  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (set_cursor_from_row): Display cursor after all the
+       glyphs that come from an overlay.  Don't overstep the last glyph
+       when skipping glyphs from an overlay.  (Bug#6687)
+
 2010-11-18  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * alloc.c (refill_memory_reserve): Move declaration ...

diff --git a/src/xdisp.c b/src/xdisp.c
index e02abf6a5b5821f2fb44ffddb7622f8d5ac210ed..b2d81cb60e9f275245f114f72a470a88322a1b35 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12941,7 +12941,8 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                             cursor on that character's glyph.  */
                          EMACS_INT strpos = glyph->charpos;
 
-                         cursor = glyph;
+                         if (tem)
+                           cursor = glyph;
                          for (glyph += incr;
                               (row->reversed_p ? glyph > stop : glyph < stop)
                                 && EQ (glyph->object, str);
@@ -12958,7 +12959,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                                  cursor = glyph;
                                  break;
                                }
-                             if (glyph->charpos < strpos)
+                             if (tem && glyph->charpos < strpos)
                                {
                                  strpos = glyph->charpos;
                                  cursor = glyph;
@@ -12973,10 +12974,9 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                    }
                  /* This string is not what we want; skip all of the
                     glyphs that came from it.  */
-                 do
-                   glyph += incr;
                  while ((row->reversed_p ? glyph > stop : glyph < stop)
-                        && EQ (glyph->object, str));
+                        && EQ (glyph->object, str))
+                   glyph += incr;
                }
              else
                glyph += incr;