[Emacs-diffs] /srv/bzr/emacs/trunk r106264: Fix mouse highlight in continued lines on a TTY.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106264
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2011-11-01 20:57:03 +0200
message:
  Fix mouse highlight in continued lines on a TTY.
  
   src/xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.
   Don't stop backward scan on the continuation glyph, even though
   its CHARPOS is positive.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-01 16:21:41 +0000
+++ b/src/ChangeLog     2011-11-01 18:57:03 +0000
@@ -1,3 +1,9 @@
+2011-11-01  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.
+       Don't stop backward scan on the continuation glyph, even though
+       its CHARPOS is positive.
+
 2011-11-01  Martin Rudalics  <address@hidden>
 
        * window.c (temp_output_buffer_show): Don't use

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-10-30 18:07:48 +0000
+++ b/src/xdisp.c       2011-11-01 18:57:03 +0000
@@ -25875,10 +25875,10 @@
        r2 = next;
     }
   /* The rest of the display engine assumes that mouse_face_beg_row is
-     either above below mouse_face_end_row or identical to it.  But
-     with bidi-reordered continued lines, the row for START_CHARPOS
-     could be below the row for END_CHARPOS.  If so, swap the rows and
-     store them in correct order.  */
+     either above mouse_face_end_row or identical to it.  But with
+     bidi-reordered continued lines, the row for START_CHARPOS could
+     be below the row for END_CHARPOS.  If so, swap the rows and store
+     them in correct order.  */
   if (r1->y > r2->y)
     {
       struct glyph_row *tem = r2;
@@ -26030,8 +26030,7 @@
         row, and also blanks and stretch glyphs inserted by
         extend_face_to_end_of_line.  */
       while (end > glyph
-            && INTEGERP ((end - 1)->object)
-            && (end - 1)->charpos <= 0)
+            && INTEGERP ((end - 1)->object))
        --end;
       /* Scan the rest of the glyph row from the end, looking for the
         first glyph that comes from BEFORE_STRING, AFTER_STRING, or
@@ -26077,8 +26076,7 @@
       x = r2->x;
       end++;
       while (end < glyph
-            && INTEGERP (end->object)
-            && end->charpos <= 0)
+            && INTEGERP (end->object))
        {
          x += end->pixel_width;
          ++end;