From: Kim F. Storm <storm@cua.dk>
Date: Sat, 24 Feb 2007 21:52:43 +0000 (+0000)
Subject: (cua-paste): Handle x-clipboard-yank.
X-Git-Tag: emacs-pretest-22.0.95~127
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed8bc9f8e407c104357ae8a96eef777881d4716e;p=emacs.git

(cua-paste): Handle x-clipboard-yank.
(cua--init-keymaps): Remap x-clipboard-yank to cua-paste.
---

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