Mercurial > emacs

changeset 92298:eecc39fe9ec9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(handle_auto_composed_prop): Don't make composition if it->string is a string.
author Kenichi Handa <handa@m17n.org>
date Thu, 28 Feb 2008 05:46:03 +0000
parents 694466e46d7a
children 308d2bf4bef5
files src/xdisp.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Thu Feb 28 03:49:35 2008 +0000
+++ b/src/xdisp.c	Thu Feb 28 05:46:03 2008 +0000
@@ -4634,7 +4634,7 @@
 		val = Qnil;
 	    }
 	}
-      if (NILP (val))
+      if (NILP (val) && ! STRINGP (it->string))
 	{
 	  if (limit < 0)
 	    limit = (STRINGP (it->string) ? SCHARS (it->string)