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

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.
+
 
 * Lisp Changes in Emacs 24.5
 

src/ChangeLog

 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.

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.