From: Gregory Heytings <gregory@heytings.org>
Date: Thu, 4 Aug 2022 10:21:31 +0000 (+0200)
Subject: Merge branch 'master' into feature/long-lines-improvements
X-Git-Tag: emacs-29.0.90~1447^2~431^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2b774e64a903e856356971c0fc3a3835d3883c1;p=emacs.git

Merge branch 'master' into feature/long-lines-improvements
---

e2b774e64a903e856356971c0fc3a3835d3883c1
diff --cc src/xdisp.c
index 12f56227e46,2bedf1c7847..099efed2db1
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@@ -4399,9 -4403,11 +4399,10 @@@ handle_fontified_prop (struct it *it
  	  if (charpos < begv || charpos > zv)
  	    {
  	      begv = get_narrowed_begv (it->w, charpos);
 -	      if (!begv) begv = BEGV;
  	      zv = get_narrowed_zv (it->w, charpos);
  	    }
- 	  Fnarrow_to_region (make_fixnum (begv), make_fixnum (zv), Qt);
+ 	  narrow_to_region_internal (make_fixnum (begv), make_fixnum (zv), true);
+ 	  specbind (Qrestrictions_locked, Qt);
  	}
  
        /* Don't allow Lisp that runs from 'fontification-functions'