aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2022-08-13 18:52:46 +0300
committerEli Zaretskii2022-08-13 18:52:46 +0300
commita1cf3b96f84794b708a9d80281d4e9deadfb610c (patch)
tree1ae3360397c9be608b3133e4ad7d8056d72cfba9
parentf289a17c068e5486f6d8fa695b4c36bcb9978996 (diff)
downloademacs-a1cf3b96f84794b708a9d80281d4e9deadfb610c.tar.gz
emacs-a1cf3b96f84794b708a9d80281d4e9deadfb610c.zip
; Fix documentation of 'deactivate-mark'
* src/keyboard.c (syms_of_keyboard): * etc/NEWS: Fix the documentation of 'deactivate-mark' and its new value 'dont-save'. (Bug#57147)
-rw-r--r--etc/NEWS6
-rw-r--r--src/keyboard.c11
2 files changed, 10 insertions, 7 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 4f1ae745143..e2bccca4a8f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2570,10 +2570,10 @@ patcomp.el, pc-mode.el, pc-select.el, s-region.el, and sregex.el.
2570* Lisp Changes in Emacs 29.1 2570* Lisp Changes in Emacs 29.1
2571 2571
2572--- 2572---
2573** New 'dont-save' value of 'deactivate-mark'. 2573** 'deactivate-mark' can have new value 'dont-save'.
2574This value means that Emacs should deactivate the mark as usual, but 2574This value means that Emacs should deactivate the mark as usual, but
2575without setting the primary selection should 'select-active-regions' 2575without setting the primary selection, if 'select-active-regions' is
2576be enabled. 2576enabled.
2577 2577
2578+++ 2578+++
2579** New 'declare' form 'interactive-args'. 2579** New 'declare' form 'interactive-args'.
diff --git a/src/keyboard.c b/src/keyboard.c
index 05c68ea7fbc..8a2b7d58c4b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12650,14 +12650,17 @@ cancels any modification. */);
12650 12650
12651 DEFSYM (Qdeactivate_mark, "deactivate-mark"); 12651 DEFSYM (Qdeactivate_mark, "deactivate-mark");
12652 DEFVAR_LISP ("deactivate-mark", Vdeactivate_mark, 12652 DEFVAR_LISP ("deactivate-mark", Vdeactivate_mark,
12653 doc: /* If an editing command sets this to t, deactivate the mark afterward. 12653 doc: /* Whether to deactivate the mark after an editing command.
12654The command loop sets this to nil before each command, 12654The command loop sets this to nil before each command,
12655and tests the value when the command returns. 12655and tests the value when the command returns.
12656Buffer modification stores t in this variable. 12656If an editing command sets this non-nil, deactivate the mark after
12657the command returns.
12658
12659Buffer modifications store t in this variable.
12657 12660
12658By default, deactivating the mark will save the contents of the region 12661By default, deactivating the mark will save the contents of the region
12659according to `select-active-regions'. If this is set to the symbol 12662according to `select-active-regions', unless this is set to the symbol
12660`dont-save', the region will not be saved.*/); 12663`dont-save'. */);
12661 Vdeactivate_mark = Qnil; 12664 Vdeactivate_mark = Qnil;
12662 Fmake_variable_buffer_local (Qdeactivate_mark); 12665 Fmake_variable_buffer_local (Qdeactivate_mark);
12663 12666