From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 12 Jan 2016 19:21:12 +0000 (+0200)
Subject: Update documentation of 'deactivate-mark'.
X-Git-Tag: emacs-25.0.90~192
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a71783bd6c63b5d6a169ce28902da5185e294f30;p=emacs.git

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 bf185431384..1c904666cb4 100644
--- 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 34c489a1a3c..6d474437de0 100644
--- 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.