From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 3 May 2004 20:02:49 +0000 (+0000)
Subject: * term/x-win.el (x-clipboard-yank): Don't exit on error from
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/e43a720fd668e75234567fe43363f647ce5b8515

* term/x-win.el (x-clipboard-yank): Don't exit on error from
  x-get-selection.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c62f23c8f..f3a9555d10 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 4b419a57a9..d970080941 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2459,7 +2459,10 @@ order until succeed.")
 (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))