[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 23f139e 1/3: * lisp/emulation/cua-base.el (cua-past
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 23f139e 1/3: * lisp/emulation/cua-base.el (cua-paste): Quieten compilation. |
Date: |
Thu, 15 Mar 2018 20:23:20 -0400 (EDT) |
branch: master
commit 23f139e72aec04356c688a32b782e367d79cd0c3
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* lisp/emulation/cua-base.el (cua-paste): Quieten compilation.
---
lisp/emulation/cua-base.el | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index a737bb6..ff23484 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)))))))