[Emacs-diffs] Changes to emacs/lisp/emulation/cua-rect.el

[Kim F . Storm]

Index: emacs/lisp/emulation/cua-rect.el
diff -c emacs/lisp/emulation/cua-rect.el:1.26 
emacs/lisp/emulation/cua-rect.el:1.27
*** emacs/lisp/emulation/cua-rect.el:1.26       Thu Dec  8 20:56:35 2005
--- emacs/lisp/emulation/cua-rect.el    Thu Dec  8 22:24:35 2005
***************
*** 1358,1364 ****
  
  (defun cua-help-for-rectangle (&optional help)
    (interactive)
!   (let ((M (if cua-use-hyper-key " H-" " M-")))
      (message
       (concat (if help "C-?:help" "")
               M "p:pad" M "o:open" M "c:close" M "b:blank"
--- 1358,1366 ----
  
  (defun cua-help-for-rectangle (&optional help)
    (interactive)
!   (let ((M (cond ((eq cua--rectangle-modifier-key 'hyper) " H-")
!                ((eq cua--rectangle-modifier-key 'super) " s-")
!                (t " M-"))))
      (message
       (concat (if help "C-?:help" "")
               M "p:pad" M "o:open" M "c:close" M "b:blank"
***************
*** 1410,1421 ****
    (cua--M/H-key cua--rectangle-keymap key cmd))
  
  (defun cua--init-rectangles ()
!   (unless (eq cua-use-hyper-key 'only)
!     (define-key cua--rectangle-keymap [(control return)] 
'cua-clear-rectangle-mark)
!     (define-key cua--region-keymap    [(control return)] 
'cua-toggle-rectangle-mark))
!   (when cua-use-hyper-key
!     (cua--rect-M/H-key 'space                        
'cua-clear-rectangle-mark)
!     (cua--M/H-key cua--region-keymap 'space          
'cua-toggle-rectangle-mark))
  
    (define-key cua--rectangle-keymap [remap copy-region-as-kill] 
'cua-copy-rectangle)
    (define-key cua--rectangle-keymap [remap kill-ring-save]      
'cua-copy-rectangle)
--- 1412,1422 ----
    (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)
!   (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))
  
    (define-key cua--rectangle-keymap [remap copy-region-as-kill] 
'cua-copy-rectangle)
    (define-key cua--rectangle-keymap [remap kill-ring-save]      
'cua-copy-rectangle)