emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

feature/long-lines-and-font-locking 304e2a3a05: Avoid assertion violatio


From: Eli Zaretskii
Subject: feature/long-lines-and-font-locking 304e2a3a05: Avoid assertion violations in 'handle_fontified_prop'
Date: Fri, 22 Jul 2022 15:23:13 -0400 (EDT)

branch: feature/long-lines-and-font-locking
commit 304e2a3a05feee6578aadfa0228dde734fe850cf
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Avoid assertion violations in 'handle_fontified_prop'
    
    * src/xdisp.c (handle_fontified_prop): Avoid assertion violations
    due to automatic narrowing.  (Bug#56682)
---
 src/xdisp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index caa421c281..215a6d561e 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;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]