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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 37635555a0f23adb624f9d86377d1894abfc9499..d27a8625407083a61b8581cce320b4e0d6f4fe49 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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  <rudalics@gmx.at>
 
        * window.c (temp_output_buffer_show): Don't use

diff --git a/src/xdisp.c b/src/xdisp.c
index 33c5fc0d23015826960dde90af0d278269d3543b..99d0d69d8348cab90d53a106ce1f2e25892c6ab9 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25875,10 +25875,10 @@ mouse_face_from_buffer_pos (Lisp_Object window,
        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 @@ mouse_face_from_buffer_pos (Lisp_Object window,
         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 @@ mouse_face_from_buffer_pos (Lisp_Object window,
       x = r2->x;
       end++;
       while (end < glyph
-            && INTEGERP (end->object)
-            && end->charpos <= 0)
+            && INTEGERP (end->object))
        {
          x += end->pixel_width;
          ++end;