1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00

* xdisp.c (mouse_face_from_buffer_pos): Fix detection of

truncation glyphs (Bug#3686).
This commit is contained in:
Chong Yidong 2009-06-27 03:50:23 +00:00
parent 920b116e67
commit cd9b5e16ff
2 changed files with 14 additions and 3 deletions

View File

@ -1,10 +1,15 @@
2009-06-27 Chong Yidong <cyd@stupidchicken.com>
* xdisp.c (mouse_face_from_buffer_pos): Fix detection of
truncation glyphs (Bug#3686).
2009-06-27 Glenn Morris <rgm@gnu.org>
* m/pmax.h: Restore file, with only netbsd portions.
2009-06-26 David Reitter <david.reitter@gmail.com>
* nsterm.m (keydown): avoid infinite loop
* nsterm.m (keydown): Avoid infinite loop.
2009-06-26 Peter Jolly <peter@jollys.org> (tiny change)

View File

@ -22991,7 +22991,10 @@ mouse_face_from_buffer_pos (Lisp_Object window,
/* 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 @@ mouse_face_from_buffer_pos (Lisp_Object window,
/* 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