777 |
(let ((start (mark)) (end (point))) |
(let ((start (mark)) (end (point))) |
778 |
(or (<= start end) |
(or (<= start end) |
779 |
(setq start (prog1 end (setq end start)))) |
(setq start (prog1 end (setq end start)))) |
780 |
(if cua--register |
(cond |
781 |
(copy-to-register cua--register start end nil) |
(cua--register |
782 |
(copy-region-as-kill start end)) |
(copy-to-register cua--register start end nil)) |
783 |
|
((eq this-original-command 'clipboard-kill-ring-save) |
784 |
|
(clipboard-kill-ring-save start end)) |
785 |
|
(t |
786 |
|
(copy-region-as-kill start end))) |
787 |
(if cua-keep-region-after-copy |
(if cua-keep-region-after-copy |
788 |
(cua--keep-active) |
(cua--keep-active) |
789 |
(cua--deactivate)))) |
(cua--deactivate)))) |
799 |
(let ((start (mark)) (end (point))) |
(let ((start (mark)) (end (point))) |
800 |
(or (<= start end) |
(or (<= start end) |
801 |
(setq start (prog1 end (setq end start)))) |
(setq start (prog1 end (setq end start)))) |
802 |
(if cua--register |
(cond |
803 |
(copy-to-register cua--register start end t) |
(cua--register |
804 |
(kill-region start end))) |
(copy-to-register cua--register start end t)) |
805 |
|
((eq this-original-command 'clipboard-kill-region) |
806 |
|
(clipboard-kill-region start end)) |
807 |
|
(t |
808 |
|
(kill-region start end)))) |
809 |
(cua--deactivate))) |
(cua--deactivate))) |
810 |
|
|
811 |
;;; Generic commands for regions, rectangles, and global marks |
;;; Generic commands for regions, rectangles, and global marks |
872 |
(cua--insert-rectangle (cdr cua--last-killed-rectangle) |
(cua--insert-rectangle (cdr cua--last-killed-rectangle) |
873 |
nil paste-column paste-lines) |
nil paste-column paste-lines) |
874 |
(if arg (goto-char pt)))) |
(if arg (goto-char pt)))) |
875 |
|
((eq this-original-command 'clipboard-yank) |
876 |
|
(clipboard-yank)) |
877 |
(t (yank arg))))))) |
(t (yank arg))))))) |
878 |
|
|
879 |
(defun cua-paste-pop (arg) |
(defun cua-paste-pop (arg) |
1292 |
(define-key cua--region-keymap [remap delete-char] 'cua-delete-region) |
(define-key cua--region-keymap [remap delete-char] 'cua-delete-region) |
1293 |
;; kill region |
;; kill region |
1294 |
(define-key cua--region-keymap [remap kill-region] 'cua-cut-region) |
(define-key cua--region-keymap [remap kill-region] 'cua-cut-region) |
1295 |
|
(define-key cua--region-keymap [remap clipboard-kill-region] 'cua-cut-region) |
1296 |
;; copy region |
;; copy region |
1297 |
(define-key cua--region-keymap [remap copy-region-as-kill] 'cua-copy-region) |
(define-key cua--region-keymap [remap copy-region-as-kill] 'cua-copy-region) |
1298 |
(define-key cua--region-keymap [remap kill-ring-save] 'cua-copy-region) |
(define-key cua--region-keymap [remap kill-ring-save] 'cua-copy-region) |
1299 |
|
(define-key cua--region-keymap [remap clipboard-kill-ring-save] 'cua-copy-region) |
1300 |
;; cancel current region/rectangle |
;; cancel current region/rectangle |
1301 |
(define-key cua--region-keymap [remap keyboard-escape-quit] 'cua-cancel) |
(define-key cua--region-keymap [remap keyboard-escape-quit] 'cua-cancel) |
1302 |
(define-key cua--region-keymap [remap keyboard-quit] 'cua-cancel) |
(define-key cua--region-keymap [remap keyboard-quit] 'cua-cancel) |