procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(handle_auto_composed_prop): Don't make composition if it->string

Browse source 
is a string.
This commit is contained in:
Kenichi Handa 2008-02-28 05:46:27 +00:00
parent 74c52de17f
commit ee548a94a0
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -2,6 +2,8 @@
* xdisp.c (display_mode_element): Cancel the previous change.
(decode_mode_spec): Likewise.
(handle_auto_composed_prop): Don't make composition if it->string
is a string.
2008-02-27 Kim F. Storm <storm@cua.dk>

2
src/xdisp.c
View file

@ -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)