From: Eli Zaretskii Date: Fri, 22 Jul 2022 19:22:08 +0000 (+0300) Subject: Avoid assertion violations in 'handle_fontified_prop' X-Git-Tag: emacs-29.0.90~1447^2~675^2~12 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=304e2a3a05feee6578aadfa0228dde734fe850cf;p=emacs.git Avoid assertion violations in 'handle_fontified_prop' * src/xdisp.c (handle_fontified_prop): Avoid assertion violations due to automatic narrowing. (Bug#56682) --- diff --git a/src/xdisp.c b/src/xdisp.c index caa421c2818..215a6d561ea 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4395,6 +4395,11 @@ handle_fontified_prop (struct it *it) bool old_clip_changed = current_buffer->clip_changed; bool saved_inhibit_flag = it->f->inhibit_clear_image_cache; + val = Vfontification_functions; + specbind (Qfontification_functions, Qnil); + + eassert (it->end_charpos == ZV); + if (it->narrowed_begv) { record_unwind_protect (unwind_narrowed_begv, Fpoint_min ()); @@ -4404,11 +4409,6 @@ handle_fontified_prop (struct it *it) specbind (Qinhibit_widen, Qt); } - val = Vfontification_functions; - specbind (Qfontification_functions, Qnil); - - eassert (it->end_charpos == ZV); - /* Don't allow Lisp that runs from 'fontification-functions' clear our face and image caches behind our back. */ it->f->inhibit_clear_image_cache = true;