Update documentation of 'deactivate-mark'.

* doc/lispref/markers.texi (The Mark): Document that
'deactivate-mark' is now buffer-local when set.

diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index bf1854313845278d847b8f8d03b196ba22cc5415..1c904666cb45505c57cf027e7dc515a6a5a21823 100644 (file)
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -576,7 +576,7 @@ If an editor command sets this variable non-@code{nil}, then the editor
 command loop deactivates the mark after the command returns (if
 Transient Mark mode is enabled).  All the primitives that change the
 buffer set @code{deactivate-mark}, to deactivate the mark when the
-command is finished.
+command is finished.  Setting this variable makes it buffer-local.
 
 To write Lisp code that modifies the buffer without causing
 deactivation of the mark at the end of the command, bind

diff --git a/etc/NEWS b/etc/NEWS
index 34c489a1a3c42a8dc4aeb7b8eeb34f13e9e1ba53..6d474437de0f0f69c33d23977ed97ef47643e59a 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1232,11 +1232,14 @@ If you want the old behavior of calling the function in the buffer
 from which the minibuffer was entered, use the new argument
 `switch-buffer' to `completion-table-dynamic'.
 
+---
 ** window-configurations no longer record the buffers' marks.
 
+---
 ** inhibit-modification-hooks now also inhibits lock-file checks, as well as
 active region handling.
 
++++
 ** deactivate-mark is now buffer-local.
 
 ** `cl-the' now asserts that its argument is of the given type.