From 6e9bad1452282beabc27140cd83b6b8b17ec74d6 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 28 Jan 2012 22:29:29 +0800 Subject: [PATCH] * lisp/simple.el (deactivate-mark): Doc fix (Bug#8614). --- lisp/ChangeLog | 2 ++ lisp/simple.el | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8bde5f91046..e48f16ff8ce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -47,6 +47,8 @@ 2012-01-28 Chong Yidong + * simple.el (deactivate-mark): Doc fix (Bug#8614). + * tooltip.el (tooltip-mode): Doc fix. (tooltip-use-echo-area): Mark as obsolete (Bug#6595). diff --git a/lisp/simple.el b/lisp/simple.el index d9468ed5cf6..cc56dfe04ce 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3751,10 +3751,18 @@ a mistake; see the documentation of `set-mark'." (signal 'mark-inactive nil))) (defsubst deactivate-mark (&optional force) - "Deactivate the mark by setting `mark-active' to nil. -Unless FORCE is non-nil, this function does nothing if Transient -Mark mode is disabled. -This function also runs `deactivate-mark-hook'." + "Deactivate the mark. +If Transient Mark mode is disabled, this function normally does +nothing; but if FORCE is non-nil, it deactivates the mark anyway. + +Deactivating the mark sets `mark-active' to nil, updates the +primary selection according to `select-active-regions', and runs +`deactivate-mark-hook'. + +If Transient Mark mode was temporarily enabled, reset the value +of the variable `transient-mark-mode'; if this causes Transient +Mark mode to be disabled, don't change `mark-active' to nil or +run `deactivate-mark-hook'." (when (or transient-mark-mode force) (when (and (if (eq select-active-regions 'only) (eq (car-safe transient-mark-mode) 'only) -- 2.39.2