summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2015-04-13 10:16:38 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2015-04-13 10:16:38 -0400
commitc9d78e18c66dc46f0988257e0029213ac7eff62b (patch)
tree7bb5e5338a37b1971facb2a18d02b6fa8ffef360
parent659609d1820129217e8c4526b629feddf3416767 (diff)
downloademacs-c9d78e18c66dc46f0988257e0029213ac7eff62b.tar.gz
* src/*.c: Set deactivate_mark buffer-locally
Fixes: debbugs:20260 * src/insdel.c (prepare_to_modify_buffer_1): * src/fileio.c (Finsert_file_contents): Set deactivate_mark buffer-locally.
-rw-r--r--src/fileio.c2
-rw-r--r--src/insdel.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c
index d4e12cbe277..a6e7fbb83d2 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4165,7 +4165,7 @@ by calling `format-decode', which see. */)
Vdeactivate_mark = old_Vdeactivate_mark;
}
else
- Vdeactivate_mark = Qt;
+ Fset (Qdeactivate_mark, Qt);
emacs_close (fd);
clear_unwind_protect (fd_index);
diff --git a/src/insdel.c b/src/insdel.c
index 80650be25ae..22c2bcccb82 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1846,7 +1846,7 @@ prepare_to_modify_buffer_1 (ptrdiff_t start, ptrdiff_t end,
= call1 (Fsymbol_value (Qregion_extract_function), Qnil);
signal_before_change (start, end, preserve_ptr);
- Vdeactivate_mark = Qt;
+ Fset (Qdeactivate_mark, Qt);
}
/* Like above, but called when we know that the buffer text