From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 21 Mar 2009 18:30:38 +0000 (+0000)
Subject: (handle-shift-selection): Doc fix.  (Bug#2738)
X-Git-Tag: emacs-pretest-23.0.92~103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=acc060e4e4544306d8b86317c4c04565ff082f86;p=emacs.git

(handle-shift-selection): Doc fix.  (Bug#2738)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 664452cd0da..e8771a5a450 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-21  Eli Zaretskii  <eliz@gnu.org>
+
+	* simple.el (handle-shift-selection): Doc fix.  (Bug#2738)
+
 2009-03-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* files.el (file-modes-rights-to-number): Doc fix.
diff --git a/lisp/simple.el b/lisp/simple.el
index db1cdcfe5e6..88da60e92a2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3747,18 +3747,21 @@ mode temporarily."
     nil))
 
 (defun handle-shift-selection (&optional deactivate)
-  "Check for shift translation, and operate on the mark accordingly.
+  "Activate or deactivate the mark depending on whether the
+current command was invoked through ``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 while `shift-select-mode' is
 non-nil.
 
-If the command was invoked through shift-translation, set the
+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 and a region is temporarily active, deactivate
-the mark.
-
-With optional arg DEACTIVATE, only perform region deactivation."
+set in this way.  If the command was invoked without shift
+translation, or if the optional argument DEACTIVATE is non-nil,
+deactivate the mark if the region is temporarily active."
   (cond ((and this-command-keys-shift-translated
 	      (null deactivate))
 	 (unless (and mark-active