From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 13 Aug 2022 15:52:46 +0000 (+0300)
Subject: ; Fix documentation of 'deactivate-mark'
X-Git-Tag: emacs-29.0.90~1447^2~184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1cf3b96f84794b708a9d80281d4e9deadfb610c;p=emacs.git

; 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)
---

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.
 * 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 05c68ea7fbc..8a2b7d58c4b 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);