* 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.

diff --git a/src/fileio.c b/src/fileio.c
index d4e12cbe277fb130f6a71c7c9c2ec39d28da3ffa..a6e7fbb83d24e32017eb88056b51a40dc26c4c7b 100644 (file)
--- 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 80650be25aeb9c2fa4ad0f3993024a8761be19d1..22c2bcccb82e476688fa671614d1d03674c6b7b2 100644 (file)
--- 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