aboutsummaryrefslogtreecommitdiffstats
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorKenichi Handa <[email protected]>2008-02-28 05:46:27 +0000
committerKenichi Handa <[email protected]>2008-02-28 05:46:27 +0000
commitee548a94a0fdc550326d2563e6efc41522012b35 (patch)
tree133b94b6daee842cba72f74d358896eda0a122a6 /src/xdisp.c
parent74c52de17fc8795e1983347dd1024f5e2333b22b (diff)
(handle_auto_composed_prop): Don't make composition if it->string
is a string.
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 c6ebd596c2..b558c2e8bb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4634,7 +4634,7 @@ handle_auto_composed_prop (it)
val = Qnil;
}
}
- if (NILP (val))
+ if (NILP (val) && ! STRINGP (it->string))
{
if (limit < 0)
limit = (STRINGP (it->string) ? SCHARS (it->string)