# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1238980908 0
# Node ID 5fcdac62cfcd8b5a4f4ec39824cd8945f85d888f
# Parent  17ba809d0f967a454d804b014f670efb8587604d
* simple.el (handle-shift-selection): Clarify docstring.

diff -r 17ba809d0f96 -r 5fcdac62cfcd lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 06 01:20:55 2009 +0000
+++ b/lisp/ChangeLog	Mon Apr 06 01:21:48 2009 +0000
@@ -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 -r 17ba809d0f96 -r 5fcdac62cfcd lisp/simple.el
--- a/lisp/simple.el	Mon Apr 06 01:20:55 2009 +0000
+++ b/lisp/simple.el	Mon Apr 06 01:21:48 2009 +0000
@@ -3760,20 +3760,20 @@
   :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))