Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 638-652)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177

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