* src/keyboard.c (syms_of_keyboard): Make deactivate-mark buffer-local.

diff --git a/etc/NEWS b/etc/NEWS
index 706d25925e447aa7bc2c2bb00ac73fbb0c3f2266..cd86cb628d0a116c4e38eb25ab28999ee84d5695 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -74,6 +74,8 @@ protocols as well as for "telnet" and "ftp" are passed to Tramp.
 ** inhibit-modification-hooks now also inhibits lock-file checks as well as
 active region handling.
 
+** deactivate-mark is now buffer-local.
+
 \f
 * Lisp Changes in Emacs 24.5
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 531d1f646cb9faa5e8509d813731de737de93c9b..f9da8772973709691b75ab3e94da739e65205d4d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2014-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * keyboard.c (syms_of_keyboard): Make deactivate-mark buffer-local.
+
        * insdel.c (prepare_to_modify_buffer_1): Cancel lock-file checks and
        region handling (and don't call signal_before_change) if
        inhibit_modification_hooks is set.

diff --git a/src/keyboard.c b/src/keyboard.c
index 87a2f91a17c389ceeb1f704c7b3957a4a881e65d..cdd48c340e5586dc731b67952a4479ae59504bf1 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11381,6 +11381,7 @@ and tests the value when the command returns.
 Buffer modification stores t in this variable.  */);
   Vdeactivate_mark = Qnil;
   DEFSYM (Qdeactivate_mark, "deactivate-mark");
+  Fmake_variable_buffer_local (Qdeactivate_mark);
 
   DEFVAR_LISP ("pre-command-hook", Vpre_command_hook,
               doc: /* Normal hook run before each command is executed.