Mercurial > emacs
changeset 55343:b925746ed8e7
* term/x-win.el (x-clipboard-yank): Don't exit on error from
x-get-selection.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 03 May 2004 20:02:49 +0000 |
| parents | 44d086f5e08a |
| children | f2f742f020fb |
| files | lisp/ChangeLog lisp/term/x-win.el |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon May 03 15:27:48 2004 +0000 +++ b/lisp/ChangeLog Mon May 03 20:02:49 2004 +0000 @@ -1,3 +1,8 @@ +2004-05-03 Jan D. <jhd@gaffa.localdomain> + + * term/x-win.el (x-clipboard-yank): Don't exit on error from + x-get-selection. + 2004-05-03 Jason Rumney <jasonr@gnu.org> * makefile.nt: Remove.
--- a/lisp/term/x-win.el Mon May 03 15:27:48 2004 +0000 +++ b/lisp/term/x-win.el Mon May 03 20:02:49 2004 +0000 @@ -2459,7 +2459,10 @@ (defun x-clipboard-yank () "Insert the clipboard contents, or the last stretch of killed text." (interactive) - (let ((clipboard-text (x-get-selection 'CLIPBOARD)) + (let ((clipboard-text + (condition-case nil + (x-get-selection 'CLIPBOARD) + (error nil))) (x-select-enable-clipboard t)) (if (and clipboard-text (> (length clipboard-text) 0)) (kill-new clipboard-text))