aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorJoão Távora2018-06-09 15:49:04 +0100
committerJoão Távora2018-06-09 15:49:04 +0100
commit16a7bce700f4b90bd6b2d7ab4bb860a3c29cb764 (patch)
tree48b02e12d83195e21658476dfd56caa1af71c557 /src/buffer.c
parent4aed7ee79cbea9963a84d5d925d39f7bc07aed98 (diff)
parent38111b5e98380c518aeb1bb7be52b7972a248332 (diff)
downloademacs-scratch/allow-custom-null-and-false-objects-in-jsonc.tar.gz
emacs-scratch/allow-custom-null-and-false-objects-in-jsonc.zip
Merge branch 'master' into this scratch branchscratch/allow-custom-null-and-false-objects-in-jsonc
scratch/allow-custom-null-and-false-objects-in-jsonc
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 14837372d34..244c1851fab 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1696,7 +1696,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
1696 { 1696 {
1697 ptrdiff_t count = SPECPDL_INDEX (); 1697 ptrdiff_t count = SPECPDL_INDEX ();
1698 1698
1699 record_unwind_protect (save_excursion_restore, save_excursion_save ()); 1699 record_unwind_protect_excursion ();
1700 set_buffer_internal (b); 1700 set_buffer_internal (b);
1701 1701
1702 /* First run the query functions; if any query is answered no, 1702 /* First run the query functions; if any query is answered no,