diff options
| author | Stefan Monnier | 2015-04-13 10:16:38 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2015-04-13 10:16:38 -0400 |
| commit | c9d78e18c66dc46f0988257e0029213ac7eff62b (patch) | |
| tree | 7bb5e5338a37b1971facb2a18d02b6fa8ffef360 /src | |
| parent | 659609d1820129217e8c4526b629feddf3416767 (diff) | |
| download | emacs-c9d78e18c66dc46f0988257e0029213ac7eff62b.tar.gz emacs-c9d78e18c66dc46f0988257e0029213ac7eff62b.zip | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/insdel.c | 2 |
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. */) | |||
| 4165 | Vdeactivate_mark = old_Vdeactivate_mark; | 4165 | Vdeactivate_mark = old_Vdeactivate_mark; |
| 4166 | } | 4166 | } |
| 4167 | else | 4167 | else |
| 4168 | Vdeactivate_mark = Qt; | 4168 | Fset (Qdeactivate_mark, Qt); |
| 4169 | 4169 | ||
| 4170 | emacs_close (fd); | 4170 | emacs_close (fd); |
| 4171 | clear_unwind_protect (fd_index); | 4171 | 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, | |||
| 1846 | = call1 (Fsymbol_value (Qregion_extract_function), Qnil); | 1846 | = call1 (Fsymbol_value (Qregion_extract_function), Qnil); |
| 1847 | 1847 | ||
| 1848 | signal_before_change (start, end, preserve_ptr); | 1848 | signal_before_change (start, end, preserve_ptr); |
| 1849 | Vdeactivate_mark = Qt; | 1849 | Fset (Qdeactivate_mark, Qt); |
| 1850 | } | 1850 | } |
| 1851 | 1851 | ||
| 1852 | /* Like above, but called when we know that the buffer text | 1852 | /* Like above, but called when we know that the buffer text |