From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 6 Apr 2009 01:21:48 +0000 (+0000)
Subject: * simple.el (handle-shift-selection): Clarify docstring.
X-Git-Tag: emacs-pretest-23.0.93~222
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=337c561c774d3940249be381625cdf4294471099;p=emacs.git

* simple.el (handle-shift-selection): Clarify docstring.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 615e6365d53..485b6d06401 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-05  Chong Yidong  <cyd@stupidchicken.com>
+
+	* simple.el (handle-shift-selection): Clarify docstring.
+
 2009-04-05  Michael Albinus  <michael.albinus@gmx.de>
 
 	* dired-aux.el (dired-copy-file-recursive): Set mode to "700" if
diff --git a/lisp/simple.el b/lisp/simple.el
index d6245a3b76b..0b7ed49a3a0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3760,20 +3760,20 @@ shift-translation."
   :group 'editing-basics)
 
 (defun handle-shift-selection ()
-  "Activate/deactivate mark depending on invocation thru ``shift translation.''
-
-\(See `this-command-keys-shift-translated' for the meaning of
-shift translation.)
-
-This is called whenever a command with a `^' character in its
-`interactive' spec is invoked.
-Its behavior is controlled by `shift-select-mode'.
-
-If the command was invoked through shift translation, set the
-mark and activate the region temporarily, unless it was already
-set in this way.  If the command was invoked without shift
-translation, or if the region was activated by the mouse,
-deactivate the mark if the region is temporarily active."
+  "Activate/deactivate mark depending on invocation thru shift translation.
+This function is called by `call-interactively' when a command
+with a `^' character in its `interactive' spec is invoked, before
+running the command itself.
+
+If `shift-select-mode' is enabled and the command was invoked
+through shift translation, set the mark and activate the region
+temporarily, unless it was already set in this way.  See
+`this-command-keys-shift-translated' for the meaning of shift
+translation.
+
+Otherwise, if the region has been activated temporarily,
+deactivate it, and restore the variable `transient-mark-mode' to
+its earlier value."
   (cond ((and shift-select-mode this-command-keys-shift-translated)
          (unless (and mark-active
                       (eq (car-safe transient-mark-mode) 'only))