diff options
| author | Stefan Monnier | 2014-04-09 09:21:30 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-04-09 09:21:30 -0400 |
| commit | 5f6378eed5eb0f94bafceaf4c9a5e344463a0ab3 (patch) | |
| tree | b5d41cb61cfa644a93c9158c7fa2a3ff4811bb0b /src | |
| parent | 226835801aa1b4341170e3adaeb81e5f24f88fa2 (diff) | |
| download | emacs-5f6378eed5eb0f94bafceaf4c9a5e344463a0ab3.tar.gz emacs-5f6378eed5eb0f94bafceaf4c9a5e344463a0ab3.zip | |
* src/keyboard.c (syms_of_keyboard): Make deactivate-mark buffer-local.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 531d1f646cb..f9da8772973 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-04-09 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2014-04-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * keyboard.c (syms_of_keyboard): Make deactivate-mark buffer-local. | ||
| 4 | |||
| 3 | * insdel.c (prepare_to_modify_buffer_1): Cancel lock-file checks and | 5 | * insdel.c (prepare_to_modify_buffer_1): Cancel lock-file checks and |
| 4 | region handling (and don't call signal_before_change) if | 6 | region handling (and don't call signal_before_change) if |
| 5 | inhibit_modification_hooks is set. | 7 | 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. | |||
| 11381 | Buffer modification stores t in this variable. */); | 11381 | Buffer modification stores t in this variable. */); |
| 11382 | Vdeactivate_mark = Qnil; | 11382 | Vdeactivate_mark = Qnil; |
| 11383 | DEFSYM (Qdeactivate_mark, "deactivate-mark"); | 11383 | DEFSYM (Qdeactivate_mark, "deactivate-mark"); |
| 11384 | Fmake_variable_buffer_local (Qdeactivate_mark); | ||
| 11384 | 11385 | ||
| 11385 | DEFVAR_LISP ("pre-command-hook", Vpre_command_hook, | 11386 | DEFVAR_LISP ("pre-command-hook", Vpre_command_hook, |
| 11386 | doc: /* Normal hook run before each command is executed. | 11387 | doc: /* Normal hook run before each command is executed. |