[Emacs-diffs] emacs/lisp ChangeLog simple.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/06 01:21:54

Modified files:
        lisp           : ChangeLog simple.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15548&r2=1.15549
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.983&r2=1.984

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15548
retrieving revision 1.15549
diff -u -b -r1.15548 -r1.15549
--- ChangeLog   5 Apr 2009 18:13:11 -0000       1.15548
+++ ChangeLog   6 Apr 2009 01:21:48 -0000       1.15549
@@ -1,3 +1,7 @@
+2009-04-05  Chong Yidong  <address@hidden>
+
+       * simple.el (handle-shift-selection): Clarify docstring.
+
 2009-04-05  Michael Albinus  <address@hidden>
 
        * dired-aux.el (dired-copy-file-recursive): Set mode to "700" if

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -b -r1.983 -r1.984
--- simple.el   2 Apr 2009 01:56:46 -0000       1.983
+++ simple.el   6 Apr 2009 01:21:53 -0000       1.984
@@ -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))