procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify narrowing_locks_restore

Browse source 
* src/editfns.c (narrowing_locks_restore): Simplify.
This commit is contained in:
Gregory Heytings 2022-11-27 00:53:01 +00:00
parent 1d1a83ba56
commit bf4373f90a
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/editfns.c
View file

@ -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);
}