From: Glenn Morris <rgm@gnu.org>
Date: Fri, 16 Mar 2018 00:20:24 +0000 (-0400)
Subject: * lisp/emulation/cua-base.el (cua-paste): Quieten compilation.
X-Git-Tag: emacs-27.0.90~5485
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23f139e72aec04356c688a32b782e367d79cd0c3;p=emacs.git

* lisp/emulation/cua-base.el (cua-paste): Quieten compilation.
---

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index a737bb6c11c..ff23484dd05 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -852,8 +852,6 @@ With numeric prefix arg, copy to register 0-9 instead."
   (if (fboundp 'cua--cancel-rectangle)
       (cua--cancel-rectangle)))
 
-(declare-function x-clipboard-yank "../term/x-win" ())
-
 (put 'cua-paste 'delete-selection 'yank)
 (defun cua-paste (arg)
   "Paste last cut or copied region or rectangle.
@@ -884,10 +882,8 @@ If global mark is active, copy from register or one character."
 	 ((consp regtxt) (cua--insert-rectangle regtxt))
 	 ((stringp regtxt) (insert-for-yank regtxt))
 	 (t (message "Unknown data in register %c" cua--register))))
-       ((eq this-original-command 'clipboard-yank)
-	(clipboard-yank))
-       ((eq this-original-command 'x-clipboard-yank)
-	(x-clipboard-yank))
+       ((memq this-original-command '(clipboard-yank x-clipboard-yank))
+        (funcall this-original-command))
        (t (yank arg)))))))