[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master a1cf3b96f8: ; Fix documentation of 'deactivate-mark'
From: |
Eli Zaretskii |
Subject: |
master a1cf3b96f8: ; Fix documentation of 'deactivate-mark' |
Date: |
Sat, 13 Aug 2022 11:53:52 -0400 (EDT) |
branch: master
commit a1cf3b96f84794b708a9d80281d4e9deadfb610c
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
; 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)
---
etc/NEWS | 6 +++---
src/keyboard.c | 11 +++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 4f1ae74514..e2bccca4a8 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.
* Lisp Changes in Emacs 29.1
---
-** New 'dont-save' value of 'deactivate-mark'.
+** 'deactivate-mark' can have new value 'dont-save'.
This value means that Emacs should deactivate the mark as usual, but
-without setting the primary selection should 'select-active-regions'
-be enabled.
+without setting the primary selection, if 'select-active-regions' is
+enabled.
+++
** New 'declare' form 'interactive-args'.
diff --git a/src/keyboard.c b/src/keyboard.c
index 05c68ea7fb..8a2b7d58c4 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -12650,14 +12650,17 @@ cancels any modification. */);
DEFSYM (Qdeactivate_mark, "deactivate-mark");
DEFVAR_LISP ("deactivate-mark", Vdeactivate_mark,
- doc: /* If an editing command sets this to t, deactivate the mark
afterward.
+ doc: /* Whether to deactivate the mark after an editing command.
The command loop sets this to nil before each command,
and tests the value when the command returns.
-Buffer modification stores t in this variable.
+If an editing command sets this non-nil, deactivate the mark after
+the command returns.
+
+Buffer modifications store t in this variable.
By default, deactivating the mark will save the contents of the region
-according to `select-active-regions'. If this is set to the symbol
-`dont-save', the region will not be saved.*/);
+according to `select-active-regions', unless this is set to the symbol
+`dont-save'. */);
Vdeactivate_mark = Qnil;
Fmake_variable_buffer_local (Qdeactivate_mark);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master a1cf3b96f8: ; Fix documentation of 'deactivate-mark',
Eli Zaretskii <=