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

2 files changed, 25 insertions, 8 deletions

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index cdc0cb7fea3..e7888dbdb0e 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -370,6 +370,22 @@ and after the region marked by the rectangle to search."
                  (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 @@ If ARG is the atom `-', scroll upward by nearly full screen."
             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 @@ only want to highlight the region when it is selected using a
 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)
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 120866e7925..53056d667fb 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -799,8 +799,8 @@ If command is repeated at same position, delete the rectangle."
                                 (if cua--virtual-edges-debug ?, ?\s))
                                'face rface))
                      (if (cua--rectangle-right-side)
-                         (put-text-property (1- (length ms)) (length ms) 'cursor t ms)
-                       (put-text-property 0 1 'cursor t ms))
+                         (put-text-property (1- (length ms)) (length ms) 'cursor 2 ms)
+                       (put-text-property 0 1 'cursor 2 ms))
                      (setq bs (concat bs ms))
                      (setq rface nil))
                     (t
@@ -810,8 +810,8 @@ If command is repeated at same position, delete the rectangle."
                                 (if cua--virtual-edges-debug ?~ ?\s))
                                'face rface))
                      (if (cua--rectangle-right-side)
-                         (put-text-property (1- (length as)) (length as) 'cursor t as)
-                       (put-text-property 0 1 'cursor t as))
+                         (put-text-property (1- (length as)) (length as) 'cursor 2 as)
+                       (put-text-property 0 1 'cursor 2 as))
                      (if (/= pr le)
                          (setq e (1- e))))))))
              ;; Trim old leading overlays.
@@ -1413,8 +1413,8 @@ With prefix arg, indent to that column."
   (cua--M/H-key cua--rectangle-keymap key cmd))
 
 (defun cua--init-rectangles ()
-  (define-key cua--rectangle-keymap [(control return)] 'cua-clear-rectangle-mark)
-  (define-key cua--region-keymap    [(control return)] 'cua-toggle-rectangle-mark)
+  (define-key cua--rectangle-keymap cua-rectangle-mark-key 'cua-clear-rectangle-mark)
+  (define-key cua--region-keymap    cua-rectangle-mark-key 'cua-toggle-rectangle-mark)
   (unless (eq cua--rectangle-modifier-key 'meta)
     (cua--rect-M/H-key ?\s                             'cua-clear-rectangle-mark)
     (cua--M/H-key cua--region-keymap ?\s               'cua-toggle-rectangle-mark))