aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2007-02-24 21:52:43 +0000
committerKim F. Storm2007-02-24 21:52:43 +0000
commited8bc9f8e407c104357ae8a96eef777881d4716e (patch)
treed634634dc1a73a4ecaace17cc319b7886b20c16a
parentb0943f48d9c5510f1035f2aac7994a069b307195 (diff)
downloademacs-ed8bc9f8e407c104357ae8a96eef777881d4716e.tar.gz
emacs-ed8bc9f8e407c104357ae8a96eef777881d4716e.zip
(cua-paste): Handle x-clipboard-yank.
(cua--init-keymaps): Remap x-clipboard-yank to cua-paste.
-rw-r--r--lisp/emulation/cua-base.el3
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."
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
@@ -1406,6 +1408,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
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