[Emacs-diffs] emacs/src ChangeLog xdisp.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/27 03:50:25

Modified files:
        src            : ChangeLog xdisp.c 

Log message:
        * xdisp.c (mouse_face_from_buffer_pos): Fix detection of
        truncation glyphs (Bug#3686).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7605&r2=1.7606
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1290&r2=1.1291

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7605
retrieving revision 1.7606
diff -u -b -r1.7605 -r1.7606
--- ChangeLog   27 Jun 2009 02:40:34 -0000      1.7605
+++ ChangeLog   27 Jun 2009 03:50:23 -0000      1.7606
@@ -1,10 +1,15 @@
+2009-06-27  Chong Yidong  <address@hidden>
+
+       * xdisp.c (mouse_face_from_buffer_pos): Fix detection of
+       truncation glyphs (Bug#3686).
+
 2009-06-27  Glenn Morris  <address@hidden>
 
        * m/pmax.h: Restore file, with only netbsd portions.
 
 2009-06-26  David Reitter <address@hidden>
 
-       * nsterm.m (keydown): avoid infinite loop
+       * nsterm.m (keydown): Avoid infinite loop.
 
 2009-06-26  Peter Jolly  <address@hidden>  (tiny change)
 

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1290
retrieving revision 1.1291
diff -u -b -r1.1290 -r1.1291
--- xdisp.c     22 Jun 2009 01:53:13 -0000      1.1290
+++ xdisp.c     27 Jun 2009 03:50:24 -0000      1.1291
@@ -22991,7 +22991,10 @@
 
       /* Skip truncation glyphs at the start of the glyph row.  */
       if (row->displays_text_p)
-       for (; glyph < end && INTEGERP (glyph->object); ++glyph)
+       for (; glyph < end
+              && INTEGERP (glyph->object)
+              && glyph->charpos < 0;
+            ++glyph)
          x += glyph->pixel_width;
 
       /* Scan the glyph row, stopping before BEFORE_STRING or
@@ -23039,7 +23042,10 @@
 
   /* Skip truncation glyphs at the start of the row.  */
   if (row->displays_text_p)
-    for (; glyph < end && INTEGERP (glyph->object); ++glyph)
+    for (; glyph < end
+          && INTEGERP (glyph->object)
+          && glyph->charpos < 0;
+        ++glyph)
       x += glyph->pixel_width;
 
   /* Scan the glyph row, stopping at END_CHARPOS or when we encounter