diff options
| author | Andreas Schwab | 2009-03-27 16:50:14 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2009-03-27 16:50:14 +0000 |
| commit | 11ff3b6711269495d70f771f20fbc3fcffba4661 (patch) | |
| tree | 6e46ab430490f85628081078c2b014b4ae56cea5 | |
| parent | d347e4943a371d278f479db89d932f136d6ee659 (diff) | |
| download | emacs-11ff3b6711269495d70f771f20fbc3fcffba4661.tar.gz emacs-11ff3b6711269495d70f771f20fbc3fcffba4661.zip | |
* simple.el (shift-select-mode): Make it a defcustom.
* cus-start.el: Remove shift-select-mode.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/cus-start.el | 1 | ||||
| -rw-r--r-- | lisp/simple.el | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bae35e3974c..00e5df9f5e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-03-27 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * simple.el (shift-select-mode): Make it a defcustom. | ||
| 4 | * cus-start.el: Remove shift-select-mode. | ||
| 5 | |||
| 1 | 2009-03-26 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2009-03-26 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * simple.el (shift-select-mode): Move declaration from callint.c. | 8 | * simple.el (shift-select-mode): Move declaration from callint.c. |
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 10b352f0e46..d8d3cc5d3ac 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el | |||
| @@ -98,7 +98,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of | |||
| 98 | "22.1") | 98 | "22.1") |
| 99 | ;; callint.c | 99 | ;; callint.c |
| 100 | (mark-even-if-inactive editing-basics boolean) | 100 | (mark-even-if-inactive editing-basics boolean) |
| 101 | (shift-select-mode editing-basics boolean) | ||
| 102 | ;; callproc.c | 101 | ;; callproc.c |
| 103 | (shell-file-name execute file) | 102 | (shell-file-name execute file) |
| 104 | (exec-path execute | 103 | (exec-path execute |
diff --git a/lisp/simple.el b/lisp/simple.el index 8664634196e..999809e6bd8 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3746,7 +3746,7 @@ mode temporarily." | |||
| 3746 | (t (activate-mark))) | 3746 | (t (activate-mark))) |
| 3747 | nil)) | 3747 | nil)) |
| 3748 | 3748 | ||
| 3749 | (defvar shift-select-mode t | 3749 | (defcustom shift-select-mode t |
| 3750 | "When non-nil, shifted motion keys activate the mark momentarily. | 3750 | "When non-nil, shifted motion keys activate the mark momentarily. |
| 3751 | 3751 | ||
| 3752 | While the mark is activated in this way, any shift-translated point | 3752 | While the mark is activated in this way, any shift-translated point |
| @@ -3756,7 +3756,9 @@ by any subsequent point motion key that was not shift-translated, or | |||
| 3756 | by any action that normally deactivates the mark in Transient Mark mode. | 3756 | by any action that normally deactivates the mark in Transient Mark mode. |
| 3757 | 3757 | ||
| 3758 | See `this-command-keys-shift-translated' for the meaning of | 3758 | See `this-command-keys-shift-translated' for the meaning of |
| 3759 | shift-translation.") | 3759 | shift-translation." |
| 3760 | :type 'boolean | ||
| 3761 | :group 'editing-basics) | ||
| 3760 | 3762 | ||
| 3761 | (defun handle-shift-selection () | 3763 | (defun handle-shift-selection () |
| 3762 | "Activate/deactivate mark depending on invocation thru ``shift translation.'' | 3764 | "Activate/deactivate mark depending on invocation thru ``shift translation.'' |