[Emacs-diffs] /srv/bzr/emacs/trunk r106980: * lisp/simple.el (deactivate-mark): Doc fix (Bug#8614).

[Chong Yidong]

------------------------------------------------------------
revno: 106980
fixes bug(s): http://debbugs.gnu.org/8614
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-01-28 22:29:29 +0800
message:
  * lisp/simple.el (deactivate-mark): Doc fix (Bug#8614).
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-28 13:58:46 +0000
+++ b/lisp/ChangeLog    2012-01-28 14:29:29 +0000
@@ -47,6 +47,8 @@
 
 2012-01-28  Chong Yidong  <address@hidden>
 
+       * simple.el (deactivate-mark): Doc fix (Bug#8614).
+
        * tooltip.el (tooltip-mode): Doc fix.
        (tooltip-use-echo-area): Mark as obsolete (Bug#6595).
 

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2012-01-19 07:21:25 +0000
+++ b/lisp/simple.el    2012-01-28 14:29:29 +0000
@@ -3751,10 +3751,18 @@
     (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)