summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2008-05-12 23:51:28 +0000
committerKenichi Handa <handa@m17n.org>2008-05-12 23:51:28 +0000
commit9bb7c0068c5e1c4cc4d8f25ad6ead6f1747d2c33 (patch)
treee72b068809e08507354f6e461bde5b9935348f2a /src/xdisp.c
parent6010cb23234606e56f28387280b79dedb6a41110 (diff)
downloademacs-old-branches/font-backend.tar.gz
*** empty log message ***old-branches/font-backend
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index e3ecc6236bc..7bccdc10520 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4571,7 +4571,7 @@ handle_auto_composed_prop (it)
{
enum prop_handled handled = HANDLED_NORMALLY;
- if (FUNCTIONP (Vauto_composition_function))
+ if (FRAME_WINDOW_P (it->f) && FUNCTIONP (Vauto_composition_function))
{
Lisp_Object val = Qnil;
EMACS_INT pos, limit = -1;