diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-15 20:20:24 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-15 20:20:24 -0400 |
| commit | 23f139e72aec04356c688a32b782e367d79cd0c3 (patch) | |
| tree | 612db51913ced49e54e464eaa122c3b6e0ab037d /lisp/emulation/cua-base.el | |
| parent | 0e2984a7f447e2404dcb7ab6ad388ddbe9221d40 (diff) | |
| download | emacs-23f139e72aec04356c688a32b782e367d79cd0c3.tar.gz | |
* lisp/emulation/cua-base.el (cua-paste): Quieten compilation.
Diffstat (limited to 'lisp/emulation/cua-base.el')
| -rw-r--r-- | lisp/emulation/cua-base.el | 8 |
1 files changed, 2 insertions, 6 deletions
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))))))) |