From: Gregory Heytings <gregory@heytings.org>
Date: Sun, 27 Nov 2022 00:53:01 +0000 (+0000)
Subject: Simplify narrowing_locks_restore
X-Git-Tag: emacs-29.0.90~1447^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf4373f90a8c396d1e26e13cd144ac4022424081;p=emacs.git

Simplify narrowing_locks_restore

* src/editfns.c (narrowing_locks_restore): Simplify.
---

diff --git a/src/editfns.c b/src/editfns.c
index ec1eec88779..a57ae823e56 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2669,8 +2669,8 @@ narrowing_locks_add (Lisp_Object buf, Lisp_Object locks)
   narrowing_locks = nconc2 (list1 (list2 (buf, locks)), narrowing_locks);
 }
 
-/* Remove BUF from the narrowing_locks alist.  Do nothing if BUF is
-   not present in narrowing_locks.  */
+/* Remove BUF and its locks from the narrowing_locks alist.  Do
+   nothing if BUF is not present in narrowing_locks.  */
 static void
 narrowing_locks_remove (Lisp_Object buf)
 {
@@ -2803,16 +2803,8 @@ narrowing_locks_restore (Lisp_Object buf_and_saved_locks)
   if (NILP (buf_and_saved_locks))
     return;
   Lisp_Object buf = XCAR (buf_and_saved_locks);
-  /* This cannot fail when buf_and_saved_locks was returned by
-     narrowing_locks_save.  */
-  eassert (BUFFERP (buf));
   Lisp_Object saved_locks = XCDR (buf_and_saved_locks);
-  /* This cannot fail when buf_and_saved_locks was returned by
-     narrowing_locks_save.  */
-  eassert (! NILP (saved_locks));
-  Lisp_Object current_locks = assq_no_quit (buf, narrowing_locks);
-  if (! NILP (current_locks))
-    narrowing_locks_remove (buf);
+  narrowing_locks_remove (buf);
   narrowing_locks_add (buf, saved_locks);
 }