From: Kenichi Handa <handa@m17n.org>
Date: Sun, 23 Nov 2003 07:32:11 +0000 (+0000)
Subject: (handle_auto_composed_prop): Fix the case of returning
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1698
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=394c6e0e944c50318de98fd1acadd71011336ea0;p=emacs.git

(handle_auto_composed_prop): Fix the case of returning
HANDLED_RECOMPUTE_PROPS.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 12dca91d0ac..bc8ed03868c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3829,7 +3829,10 @@ handle_auto_composed_prop (it)
 	  unbind_to (count, Qnil);
 
 	  val = Fget_char_property (args[1], Qauto_composed, it->string);
-	  if (! NILP (val) && this_pos == pos)
+	  /* Return HANDLED_RECOMPUTE_PROPS only if function fontified
+	     something.  This avoids an endless loop if they failed to
+	     fontify the text for which reason ever.  */
+	  if (! NILP (val))
 	    handled = HANDLED_RECOMPUTE_PROPS;
 	}
     }