aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-01-12 21:21:12 +0200
committerEli Zaretskii2016-01-12 21:21:12 +0200
commita71783bd6c63b5d6a169ce28902da5185e294f30 (patch)
treeafd5e59d0150a7228bcc4bc6de0e5bb7cd57ddfd
parentbba8c532fa025a3efffdcccd40bfe66a4e9effd2 (diff)
downloademacs-a71783bd6c63b5d6a169ce28902da5185e294f30.tar.gz
emacs-a71783bd6c63b5d6a169ce28902da5185e294f30.zip
Update documentation of 'deactivate-mark'.
* doc/lispref/markers.texi (The Mark): Document that 'deactivate-mark' is now buffer-local when set.
-rw-r--r--doc/lispref/markers.texi2
-rw-r--r--etc/NEWS3
2 files changed, 4 insertions, 1 deletions
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
576command loop deactivates the mark after the command returns (if 576command loop deactivates the mark after the command returns (if
577Transient Mark mode is enabled). All the primitives that change the 577Transient Mark mode is enabled). All the primitives that change the
578buffer set @code{deactivate-mark}, to deactivate the mark when the 578buffer set @code{deactivate-mark}, to deactivate the mark when the
579command is finished. 579command is finished. Setting this variable makes it buffer-local.
580 580
581To write Lisp code that modifies the buffer without causing 581To write Lisp code that modifies the buffer without causing
582deactivation of the mark at the end of the command, bind 582deactivation 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
1232from which the minibuffer was entered, use the new argument 1232from which the minibuffer was entered, use the new argument
1233`switch-buffer' to `completion-table-dynamic'. 1233`switch-buffer' to `completion-table-dynamic'.
1234 1234
1235---
1235** window-configurations no longer record the buffers' marks. 1236** window-configurations no longer record the buffers' marks.
1236 1237
1238---
1237** inhibit-modification-hooks now also inhibits lock-file checks, as well as 1239** inhibit-modification-hooks now also inhibits lock-file checks, as well as
1238active region handling. 1240active region handling.
1239 1241
1242+++
1240** deactivate-mark is now buffer-local. 1243** deactivate-mark is now buffer-local.
1241 1244
1242** `cl-the' now asserts that its argument is of the given type. 1245** `cl-the' now asserts that its argument is of the given type.