Mercurial > emacs
diff lisp/emulation/cua-base.el @ 90375:e6bf73e43cf4
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 164-184)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: man/mh-e.texi (Folders): Various edits.
- Update from erc--emacs--0
* gnus--rel--5.10 (patch 62-70)
- Merge from emacs--devo--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 28 Mar 2006 23:08:20 +0000 |
| parents | c5406394f567 16f8a4a89f79 |
| children | c156f6a9e7b5 |
line wrap: on
line diff
--- a/lisp/emulation/cua-base.el Tue Mar 28 11:24:02 2006 +0000 +++ b/lisp/emulation/cua-base.el Tue Mar 28 23:08:20 2006 +0000 @@ -370,6 +370,22 @@ (other :tag "Enabled" t)) :group 'cua) +(defcustom cua-rectangle-mark-key [(control return)] + "Global key used to toggle the cua rectangle mark." + :set #'(lambda (symbol value) + (set symbol value) + (when (and (boundp 'cua--keymaps-initalized) + cua--keymaps-initalized) + (define-key cua-global-keymap value + 'cua-set-rectangle-mark) + (when (boundp 'cua--rectangle-keymap) + (define-key cua--rectangle-keymap value + 'cua-clear-rectangle-mark) + (define-key cua--region-keymap value + 'cua-toggle-rectangle-mark)))) + :type 'key-sequence + :group 'cua) + (defcustom cua-rectangle-modifier-key 'meta "*Modifier key used for rectangle commands bindings. On non-window systems, always use the meta modifier. @@ -1275,7 +1291,7 @@ cua-rectangle-modifier-key 'meta)) ;; C-return always toggles rectangle mark - (define-key cua-global-keymap [(control return)] 'cua-set-rectangle-mark) + (define-key cua-global-keymap cua-rectangle-mark-key 'cua-set-rectangle-mark) (unless (eq cua--rectangle-modifier-key 'meta) (cua--M/H-key cua-global-keymap ?\s 'cua-set-rectangle-mark) (define-key cua-global-keymap @@ -1401,7 +1417,8 @@ shifted movement key, set `cua-highlight-region-shift-only'." :global t :group 'cua - :set-after '(cua-enable-modeline-indications cua-rectangle-modifier-key) + :set-after '(cua-enable-modeline-indications + cua-rectangle-mark-key cua-rectangle-modifier-key) :require 'cua-base :link '(emacs-commentary-link "cua-base.el") (setq mark-even-if-inactive t)