[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master c9d78e1: * src/*.c: Set deactivate_mark buffer-loca
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master c9d78e1: * src/*.c: Set deactivate_mark buffer-locally |
Date: |
Mon, 13 Apr 2015 14:16:45 +0000 |
branch: master
commit c9d78e18c66dc46f0988257e0029213ac7eff62b
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* 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.
---
src/fileio.c | 2 +-
src/insdel.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/fileio.c b/src/fileio.c
index d4e12cb..a6e7fbb 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 80650be..22c2bcc 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master c9d78e1: * src/*.c: Set deactivate_mark buffer-locally,
Stefan Monnier <=