From: Chong Yidong <cyd@gnu.org>
Date: Sat, 28 Jan 2012 14:29:29 +0000 (+0800)
Subject: * lisp/simple.el (deactivate-mark): Doc fix (Bug#8614).
X-Git-Tag: emacs-pretest-24.0.93~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e9bad1452282beabc27140cd83b6b8b17ec74d6;p=emacs.git

* lisp/simple.el (deactivate-mark): Doc fix (Bug#8614).
---

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  <cyd@gnu.org>
 
+	* 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)