X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3f791afed9cd1002b909cefd3482763b2a310608..7f5515125fbc9b46454e1f84b7e3052a0a5326f0:/src/xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index fcb322e1ed..dfaa9cdeac 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4583,6 +4583,11 @@ handle_composition_prop (struct it *it)
       && COMPOSITION_VALID_P (start, end, prop)
       && (STRINGP (it->string) || (PT <= start || PT >= end)))
     {
+      if (start < pos)
+	/* As we can't handle this situation (perhaps font-lock added
+	   a new composition), we just return here hoping that next
+	   redisplay will detect this composition much earlier.  */
+	return HANDLED_NORMALLY;
       if (start != pos)
 	{
 	  if (STRINGP (it->string))