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

diff --cc src/lisp.h
Simple merge

diff --cc src/xdisp.c
index 12f56227e46dfe4ba79f568152c87e72738e0290,2bedf1c78471308ee46d00ce0a3ab86266160017..099efed2db1bac176cc614cef8dc94e81ae9d919
--- 1/src/xdisp.c
--- 2/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'