diff options
| author | Glenn Morris | 2018-03-15 20:20:24 -0400 |
|---|---|---|
| committer | Glenn Morris | 2018-03-15 20:20:24 -0400 |
| commit | 23f139e72aec04356c688a32b782e367d79cd0c3 (patch) | |
| tree | 612db51913ced49e54e464eaa122c3b6e0ab037d | |
| parent | 0e2984a7f447e2404dcb7ab6ad388ddbe9221d40 (diff) | |
| download | emacs-23f139e72aec04356c688a32b782e367d79cd0c3.tar.gz emacs-23f139e72aec04356c688a32b782e367d79cd0c3.zip | |
* lisp/emulation/cua-base.el (cua-paste): Quieten compilation.
| -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." | |||
| 852 | (if (fboundp 'cua--cancel-rectangle) | 852 | (if (fboundp 'cua--cancel-rectangle) |
| 853 | (cua--cancel-rectangle))) | 853 | (cua--cancel-rectangle))) |
| 854 | 854 | ||
| 855 | (declare-function x-clipboard-yank "../term/x-win" ()) | ||
| 856 | |||
| 857 | (put 'cua-paste 'delete-selection 'yank) | 855 | (put 'cua-paste 'delete-selection 'yank) |
| 858 | (defun cua-paste (arg) | 856 | (defun cua-paste (arg) |
| 859 | "Paste last cut or copied region or rectangle. | 857 | "Paste last cut or copied region or rectangle. |
| @@ -884,10 +882,8 @@ If global mark is active, copy from register or one character." | |||
| 884 | ((consp regtxt) (cua--insert-rectangle regtxt)) | 882 | ((consp regtxt) (cua--insert-rectangle regtxt)) |
| 885 | ((stringp regtxt) (insert-for-yank regtxt)) | 883 | ((stringp regtxt) (insert-for-yank regtxt)) |
| 886 | (t (message "Unknown data in register %c" cua--register)))) | 884 | (t (message "Unknown data in register %c" cua--register)))) |
| 887 | ((eq this-original-command 'clipboard-yank) | 885 | ((memq this-original-command '(clipboard-yank x-clipboard-yank)) |
| 888 | (clipboard-yank)) | 886 | (funcall this-original-command)) |
| 889 | ((eq this-original-command 'x-clipboard-yank) | ||
| 890 | (x-clipboard-yank)) | ||
| 891 | (t (yank arg))))))) | 887 | (t (yank arg))))))) |
| 892 | 888 | ||
| 893 | 889 | ||