[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el |
Date: |
Tue, 17 May 2005 18:39:06 -0400 |
Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.50
emacs/lisp/emulation/cua-base.el:1.51
*** emacs/lisp/emulation/cua-base.el:1.50 Tue May 17 17:29:06 2005
--- emacs/lisp/emulation/cua-base.el Tue May 17 22:39:06 2005
***************
*** 159,171 ****
;; left edge of a rectangle start in the middle of a TAB character.
;; Sounds strange? Try it!
;;
! ;; To start a rectangle, use [S-return] and extend it using the normal
;; movement keys (up, down, left, right, home, end, C-home,
;; C-end). Once the rectangle has the desired size, you can cut or
;; copy it using C-x and C-c (or C-w and M-w), and you can
;; subsequently insert it - as a rectangle - using C-v (or C-y). So
;; the only new command you need to know to work with cua-mode
! ;; rectangles is S-return!
;;
;; Normally, when you paste a rectangle using C-v (C-y), each line of
;; the rectangle is inserted into the existing lines in the buffer.
--- 159,171 ----
;; left edge of a rectangle start in the middle of a TAB character.
;; Sounds strange? Try it!
;;
! ;; To start a rectangle, use [C-return] and extend it using the normal
;; movement keys (up, down, left, right, home, end, C-home,
;; C-end). Once the rectangle has the desired size, you can cut or
;; copy it using C-x and C-c (or C-w and M-w), and you can
;; subsequently insert it - as a rectangle - using C-v (or C-y). So
;; the only new command you need to know to work with cua-mode
! ;; rectangles is C-return!
;;
;; Normally, when you paste a rectangle using C-v (C-y), each line of
;; the rectangle is inserted into the existing lines in the buffer.
***************
*** 183,189 ****
;; entire rectangle overlay (but not the contents) in the given
;; direction.
;;
! ;; [S-return] cancels the rectangle
;; [C-space] activates the region bounded by the rectangle
;; If you type a normal (self-inserting) character when the rectangle is
--- 183,189 ----
;; entire rectangle overlay (but not the contents) in the given
;; direction.
;;
! ;; [C-return] cancels the rectangle
;; [C-space] activates the region bounded by the rectangle
;; If you type a normal (self-inserting) character when the rectangle is
***************
*** 194,200 ****
;; bottom of the rectangle. So, for example, to comment out an entire
;; paragraph like this one, just place the cursor on the first character
;; of the first line, and enter the following:
! ;; S-return M-} ; ; <space> S-return
;; cua-mode's rectangle support also includes all the normal rectangle
;; functions with easy access:
--- 194,200 ----
;; bottom of the rectangle. So, for example, to comment out an entire
;; paragraph like this one, just place the cursor on the first character
;; of the first line, and enter the following:
! ;; C-return M-} ; ; <space> C-return
;; cua-mode's rectangle support also includes all the normal rectangle
;; functions with easy access:
***************
*** 330,341 ****
:group 'cua)
(defcustom cua-use-hyper-key nil
! "*If non-nil, bind rectangle commands to H-? instead of M-?.
! If set to 'also, toggle region command is also on S-return.
Must be set prior to enabling CUA."
! :type '(choice (const :tag "Meta key and S-return" nil)
(const :tag "Hyper key only" only)
! (const :tag "Hyper key and S-return" also))
:group 'cua)
(defcustom cua-enable-region-auto-help nil
--- 330,341 ----
:group 'cua)
(defcustom cua-use-hyper-key nil
! "*If non-nil, bind rectangle commands to H-... instead of M-....
! If set to 'also, toggle region command is also on C-return.
Must be set prior to enabling CUA."
! :type '(choice (const :tag "Meta key and C-return" nil)
(const :tag "Hyper key only" only)
! (const :tag "Hyper key and C-return" also))
:group 'cua)
(defcustom cua-enable-region-auto-help nil
***************
*** 1235,1241 ****
(defun cua--init-keymaps ()
(unless (eq cua-use-hyper-key 'only)
! (define-key cua-global-keymap [(shift return)]
'cua-set-rectangle-mark))
(when cua-use-hyper-key
(cua--M/H-key cua-global-keymap 'space 'cua-set-rectangle-mark)
(define-key cua-global-keymap [(hyper mouse-1)]
'cua-mouse-set-rectangle-mark))
--- 1235,1241 ----
(defun cua--init-keymaps ()
(unless (eq cua-use-hyper-key 'only)
! (define-key cua-global-keymap [(control return)]
'cua-set-rectangle-mark))
(when cua-use-hyper-key
(cua--M/H-key cua-global-keymap 'space 'cua-set-rectangle-mark)
(define-key cua-global-keymap [(hyper mouse-1)]
'cua-mouse-set-rectangle-mark))