diff options
author | Kim F. Storm <storm@cua.dk> | 2007-02-24 21:52:43 +0000 |
---|---|---|
committer | Kim F. Storm <storm@cua.dk> | 2007-02-24 21:52:43 +0000 |
commit | ed8bc9f8e407c104357ae8a96eef777881d4716e (patch) | |
tree | d634634dc1a73a4ecaace17cc319b7886b20c16a /lisp | |
parent | b0943f48d9c5510f1035f2aac7994a069b307195 (diff) | |
download | emacs-ed8bc9f8e407c104357ae8a96eef777881d4716e.tar.gz |
(cua-paste): Handle x-clipboard-yank.
(cua--init-keymaps): Remap x-clipboard-yank to cua-paste.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/emulation/cua-base.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 0463b01b7e3..653597fb83b 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -930,6 +930,8 @@ If global mark is active, copy from register or one character." (if arg (goto-char pt)))) ((eq this-original-command 'clipboard-yank) (clipboard-yank)) + ((eq this-original-command 'x-clipboard-yank) + (x-clipboard-yank)) (t (yank arg))))))) @@ -1406,6 +1408,7 @@ If ARG is the atom `-', scroll upward by nearly full screen." ;; replace region with rectangle or element on kill ring (define-key cua-global-keymap [remap yank] 'cua-paste) (define-key cua-global-keymap [remap clipboard-yank] 'cua-paste) + (define-key cua-global-keymap [remap x-clipboard-yank] 'cua-paste) ;; replace current yank with previous kill ring element (define-key cua-global-keymap [remap yank-pop] 'cua-paste-pop) ;; set mark |