Mercurial > emacs
comparison lisp/emulation/cua-base.el @ 76132:0d644f70ff05
(cua-paste): Handle x-clipboard-yank.
(cua--init-keymaps): Remap x-clipboard-yank to cua-paste.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Sat, 24 Feb 2007 21:52:43 +0000 |
| parents | cfbd9931b493 |
| children | ac0efac52065 d59242324437 edf631bdbb7a dd7c098af727 |
comparison
equal
deleted
inserted
replaced
| 76131:d9413419f720 | 76132:0d644f70ff05 |
|---|---|
| 928 (cua--insert-rectangle (cdr cua--last-killed-rectangle) | 928 (cua--insert-rectangle (cdr cua--last-killed-rectangle) |
| 929 nil paste-column paste-lines) | 929 nil paste-column paste-lines) |
| 930 (if arg (goto-char pt)))) | 930 (if arg (goto-char pt)))) |
| 931 ((eq this-original-command 'clipboard-yank) | 931 ((eq this-original-command 'clipboard-yank) |
| 932 (clipboard-yank)) | 932 (clipboard-yank)) |
| 933 ((eq this-original-command 'x-clipboard-yank) | |
| 934 (x-clipboard-yank)) | |
| 933 (t (yank arg))))))) | 935 (t (yank arg))))))) |
| 934 | 936 |
| 935 | 937 |
| 936 ;; cua-paste-pop-rotate-temporarily == t mechanism: | 938 ;; cua-paste-pop-rotate-temporarily == t mechanism: |
| 937 ;; | 939 ;; |
| 1404 (define-key cua-global-keymap [(shift control ?\s)] 'cua-toggle-global-mark) | 1406 (define-key cua-global-keymap [(shift control ?\s)] 'cua-toggle-global-mark) |
| 1405 | 1407 |
| 1406 ;; replace region with rectangle or element on kill ring | 1408 ;; replace region with rectangle or element on kill ring |
| 1407 (define-key cua-global-keymap [remap yank] 'cua-paste) | 1409 (define-key cua-global-keymap [remap yank] 'cua-paste) |
| 1408 (define-key cua-global-keymap [remap clipboard-yank] 'cua-paste) | 1410 (define-key cua-global-keymap [remap clipboard-yank] 'cua-paste) |
| 1411 (define-key cua-global-keymap [remap x-clipboard-yank] 'cua-paste) | |
| 1409 ;; replace current yank with previous kill ring element | 1412 ;; replace current yank with previous kill ring element |
| 1410 (define-key cua-global-keymap [remap yank-pop] 'cua-paste-pop) | 1413 (define-key cua-global-keymap [remap yank-pop] 'cua-paste-pop) |
| 1411 ;; set mark | 1414 ;; set mark |
| 1412 (define-key cua-global-keymap [remap set-mark-command] 'cua-set-mark) | 1415 (define-key cua-global-keymap [remap set-mark-command] 'cua-set-mark) |
| 1413 | 1416 |