[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110941: Fix cursor display when several display strings follow each other.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110941
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-11-23 10:27:05 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-11-23 07:54:33 +0000
+++ b/src/ChangeLog     2012-11-23 08:27:05 +0000
@@ -1,5 +1,9 @@
 2012-11-23  Eli Zaretskii  <address@hidden>
 
+       * 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).

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-11-19 17:34:21 +0000
+++ b/src/xdisp.c       2012-11-23 08:27:05 +0000
@@ -14232,7 +14232,7 @@
      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.