; 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 4f1ae745143b1cc349f3bee62e51786ad5a10ff7..e2bccca4a8f9cb0cd3e8192b9d65b2d9c5f15090 100644 (file)
--- 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 05c68ea7fbc933f1e909cee45f131e4bccb542d1..8a2b7d58c4b9ba7dd7f5d43c7e67723e394c204f 100644 (file)
--- 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);