Mercurial > emacs

diff lisp/emulation/cua-base.el @ 83502:c1e013e3dc0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-173 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-174 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-175 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-176 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-177 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-178 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-179 Update from erc--emacs--0 * emacs@sv.gnu.org/emacs--devo--0--patch-180 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-181 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-182 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-183 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-184 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-185 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-186 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-187 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/gnus--rel--5.10--patch-65 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-66 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-67 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-68 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-69 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-70 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-71 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-72 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-542
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 01 Apr 2006 13:24:42 +0000
parents b98066f4aa10 16f8a4a89f79
children 81f2d90dee68
line wrap: on
line diff
--- a/lisp/emulation/cua-base.el	Sat Apr 01 12:54:10 2006 +0000
+++ b/lisp/emulation/cua-base.el	Sat Apr 01 13:24:42 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)