From 5f6378eed5eb0f94bafceaf4c9a5e344463a0ab3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 9 Apr 2014 09:21:30 -0400 Subject: [PATCH] * src/keyboard.c (syms_of_keyboard): Make deactivate-mark buffer-local. --- etc/NEWS | 2 ++ src/ChangeLog | 2 ++ src/keyboard.c | 1 + 3 files changed, 5 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 706d25925e4..cd86cb628d0 100644 --- 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. + * Lisp Changes in Emacs 24.5 diff --git a/src/ChangeLog b/src/ChangeLog index 531d1f646cb..f9da8772973 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2014-04-09 Stefan Monnier + * 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 87a2f91a17c..cdd48c340e5 100644 --- 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. -- 2.39.5