diff options
author | Gregory Heytings <gregory@heytings.org> | 2022-11-26 00:14:15 +0000 |
---|---|---|
committer | Gregory Heytings <gregory@heytings.org> | 2022-11-26 01:33:07 +0100 |
commit | 16b8b0d1e07d394e01f76d9eed6006219b4d745b (patch) | |
tree | a67c8a9238e131908b903a96a6dbf9f7fa8fe42d /src/editfns.c | |
parent | a24652403951751b0bb7ed41033d3414a888310a (diff) | |
download | emacs-16b8b0d1e07d394e01f76d9eed6006219b4d745b.tar.gz |
Save and restore narrowing locks in 'save-restriction'.
* src/editfns.c: (Fsave_restriction): Save and restore narrowing
locks. Suggested by Stefan Monnier.
(narrowing_locks_save, narrowing_locks_restore): Helper functions.
* lisp/subr.el (with-narrowing-1): Simplify.
Diffstat (limited to 'src/editfns.c')
-rw-r--r-- | src/editfns.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/editfns.c b/src/editfns.c index 9c81d9c723f..f73331fb53c 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -2760,6 +2760,36 @@ reset_outermost_narrowings (void) } } +/* Helper functions to save and restore the narrowing locks of the + current buffer in save-restriction. */ +static Lisp_Object +narrowing_locks_save (void) +{ + Lisp_Object buf = Fcurrent_buffer (); + Lisp_Object locks = assq_no_quit (buf, narrowing_locks); + if (NILP (locks)) + return Qnil; + locks = Fcar (Fcdr (locks)); + return Fcons (buf, Fcopy_sequence (locks)); +} + +static void +narrowing_locks_restore (Lisp_Object buf_and_saved_locks) +{ + if (NILP (buf_and_saved_locks)) + return; + Lisp_Object buf = Fcar (buf_and_saved_locks); + eassert (BUFFERP (buf)); + Lisp_Object saved_locks = Fcdr (buf_and_saved_locks); + eassert (! NILP (saved_locks)); + Lisp_Object current_locks = assq_no_quit (buf, narrowing_locks); + if (! NILP (current_locks)) + narrowing_locks = Fdelq (Fassoc (buf, narrowing_locks, Qnil), + narrowing_locks); + narrowing_locks = nconc2 (list1 (list2 (buf, saved_locks)), + narrowing_locks); +} + static void unwind_narrow_to_region_locked (Lisp_Object tag) { @@ -3050,6 +3080,7 @@ usage: (save-restriction &rest BODY) */) specpdl_ref count = SPECPDL_INDEX (); record_unwind_protect (save_restriction_restore, save_restriction_save ()); + record_unwind_protect (narrowing_locks_restore, narrowing_locks_save ()); val = Fprogn (body); return unbind_to (count, val); } |