Fix cursor display when several display strings follow each other.

 src/xdisp.c (set_cursor_from_row): Skip step 2 only if point is not
 between bpos_covered and bpos_max.  This fixes cursor display when
 several display strings follow each other.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7460e2c570494576d64744ea1d7285b47bf50c2e..88fbf7a99f2110b7d8a622812c2ff7d95605ede1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2012-11-23  Eli Zaretskii  <eliz@gnu.org>
 
+       * xdisp.c (set_cursor_from_row): Skip step 2 only if point is not
+       between bpos_covered and bpos_max.  This fixes cursor display when
+       several display strings follow each other.
+
        * .gdbinit (pgx): If the glyph's object is a string, display the
        pointer to string data, rather than the value of the string object
        itself (which barfs under CHECK_LISP_OBJECT_TYPE).

diff --git a/src/xdisp.c b/src/xdisp.c
index 85fe9a00f6054b8387627a7a7d2705f468190e9c..4bb744a2f9de05817b83282bc0f9cf68ed08a9b3 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14232,7 +14232,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
      GLYPH_BEFORE and GLYPH_AFTER.  */
   if (!((row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end)
        && BUFFERP (glyph->object) && glyph->charpos == pt_old)
-      && bpos_covered < pt_old)
+      && !(bpos_max < pt_old && pt_old <= bpos_covered))
     {
       /* An empty line has a single glyph whose OBJECT is zero and
         whose CHARPOS is the position of a newline on that line.