Merge master into feature/improved-locked-narrowing.

diff --cc lisp/subr.el
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/keyboard.c
index 4948ea40e40eea126607f475050c5cdd9111f3d1,a978d6f02b3b9d054c1b3ba5b024c34caac45731..d8796569cd2dc447600e7caa3189ef2f5156953a
--- 1/src/keyboard.c
--- 2/src/keyboard.c
+++ b/src/keyboard.c
@@@ -1932,11 -1909,12 +1909,12 @@@ safe_run_hooks_maybe_narrowed (Lisp_Obj
    specbind (Qinhibit_quit, Qt);
  
    if (current_buffer->long_line_optimizations_p)
 -    narrow_to_region_internal (make_fixnum (get_narrowed_begv (w, PT)),
 -                             make_fixnum (get_narrowed_zv (w, PT)),
 -                             true);
 +    narrow_to_region_locked (make_fixnum (get_narrowed_begv (w, PT)),
 +                           make_fixnum (get_narrowed_zv (w, PT)),
 +                           hook);
  
-   run_hook_with_args (2, ((Lisp_Object []) {hook, hook}), safe_run_hook_funcall);
+   run_hook_with_args (2, ((Lisp_Object []) {hook, hook}),
+                       safe_run_hook_funcall);
    unbind_to (count, Qnil);
  }
  

diff --cc src/lisp.h
Simple merge

diff --cc src/xdisp.c
Simple merge