From 394c6e0e944c50318de98fd1acadd71011336ea0 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Sun, 23 Nov 2003 07:32:11 +0000 Subject: [PATCH] (handle_auto_composed_prop): Fix the case of returning HANDLED_RECOMPUTE_PROPS. --- src/xdisp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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; } } -- 2.39.2