aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-08-23 10:01:25 +0300
committerEli Zaretskii2011-08-23 10:01:25 +0300
commit1a2e6670cf53a76bfd134c8453f81a2de8c6ea5c (patch)
treec3741552fcaafca772e63de6ffef24e7803b9f63 /src
parent1802e44433f0a36f3a3f877654cb2c2a666893e7 (diff)
downloademacs-1a2e6670cf53a76bfd134c8453f81a2de8c6ea5c.tar.gz
emacs-1a2e6670cf53a76bfd134c8453f81a2de8c6ea5c.zip
Fix pos-visible-in-window-p for zero-column composed character.
src/xdisp.c (x_produce_glyphs): Set it->nglyphs to 1. Fixes pixel coordinates reported by pos-visible-in-window-p for a composed character in column zero.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xdisp.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a1a826d625f..ffb8dd76366 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12011-08-23 Eli Zaretskii <eliz@gnu.org>
2
3 * xdisp.c (x_produce_glyphs): Set it->nglyphs to 1. Fixes pixel
4 coordinates reported by pos-visible-in-window-p for a composed
5 character in column zero.
6
12011-08-23 Stefan Monnier <monnier@iro.umontreal.ca> 72011-08-23 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * cmds.c (Fself_insert_command): Mention post-self-insert-hook. 9 * cmds.c (Fself_insert_command): Mention post-self-insert-hook.
diff --git a/src/xdisp.c b/src/xdisp.c
index 1878327480f..9b2b0da4317 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -24064,6 +24064,8 @@ x_produce_glyphs (struct it *it)
24064 Lisp_Object gstring; 24064 Lisp_Object gstring;
24065 struct font_metrics metrics; 24065 struct font_metrics metrics;
24066 24066
24067 it->nglyphs = 1;
24068
24067 gstring = composition_gstring_from_id (it->cmp_it.id); 24069 gstring = composition_gstring_from_id (it->cmp_it.id);
24068 it->pixel_width 24070 it->pixel_width
24069 = composition_gstring_width (gstring, it->cmp_it.from, it->cmp_it.to, 24071 = composition_gstring_width (gstring, it->cmp_it.from, it->cmp_it.to,