diff options
| author | Eli Zaretskii | 2009-03-21 18:30:38 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2009-03-21 18:30:38 +0000 |
| commit | acc060e4e4544306d8b86317c4c04565ff082f86 (patch) | |
| tree | 3b873aa13fad31dc50c71c11ad381c750a54c1c2 | |
| parent | ca66f00dcdbc96f4c60db5ce7bdb46763f79bcc6 (diff) | |
| download | emacs-acc060e4e4544306d8b86317c4c04565ff082f86.tar.gz emacs-acc060e4e4544306d8b86317c4c04565ff082f86.zip | |
(handle-shift-selection): Doc fix. (Bug#2738)
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 664452cd0da..e8771a5a450 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-03-21 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (handle-shift-selection): Doc fix. (Bug#2738) | ||
| 4 | |||
| 1 | 2009-03-21 Chong Yidong <cyd@stupidchicken.com> | 5 | 2009-03-21 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * files.el (file-modes-rights-to-number): Doc fix. | 7 | * 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." | |||
| 3747 | nil)) | 3747 | nil)) |
| 3748 | 3748 | ||
| 3749 | (defun handle-shift-selection (&optional deactivate) | 3749 | (defun handle-shift-selection (&optional deactivate) |
| 3750 | "Check for shift translation, and operate on the mark accordingly. | 3750 | "Activate or deactivate the mark depending on whether the |
| 3751 | current command was invoked through ``shift translation.'' | ||
| 3752 | |||
| 3753 | \(See `this-command-keys-shift-translated' for the meaning of | ||
| 3754 | shift translation.) | ||
| 3755 | |||
| 3751 | This is called whenever a command with a `^' character in its | 3756 | This is called whenever a command with a `^' character in its |
| 3752 | `interactive' spec is invoked while `shift-select-mode' is | 3757 | `interactive' spec is invoked while `shift-select-mode' is |
| 3753 | non-nil. | 3758 | non-nil. |
| 3754 | 3759 | ||
| 3755 | If the command was invoked through shift-translation, set the | 3760 | If the command was invoked through shift translation, set the |
| 3756 | mark and activate the region temporarily, unless it was already | 3761 | mark and activate the region temporarily, unless it was already |
| 3757 | set in this way. If the command was invoked without | 3762 | set in this way. If the command was invoked without shift |
| 3758 | shift-translation and a region is temporarily active, deactivate | 3763 | translation, or if the optional argument DEACTIVATE is non-nil, |
| 3759 | the mark. | 3764 | deactivate the mark if the region is temporarily active." |
| 3760 | |||
| 3761 | With optional arg DEACTIVATE, only perform region deactivation." | ||
| 3762 | (cond ((and this-command-keys-shift-translated | 3765 | (cond ((and this-command-keys-shift-translated |
| 3763 | (null deactivate)) | 3766 | (null deactivate)) |
| 3764 | (unless (and mark-active | 3767 | (unless (and mark-active |