From: Gregory Heytings <gregory@heytings.org>
Date: Sun, 30 Oct 2022 16:00:35 +0000 (+0100)
Subject: Merge master into feature/improved-locked-narrowing.
X-Git-Tag: emacs-29.0.90~1447^2~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aef803d6c3d61004f15d0bc82fa7bf9952302312;p=emacs.git

Merge master into feature/improved-locked-narrowing.
---

aef803d6c3d61004f15d0bc82fa7bf9952302312
diff --cc src/keyboard.c
index 4948ea40e40,a978d6f02b3..d8796569cd2
--- a/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);
  }