# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1083614569 0
# Node ID b925746ed8e73e898b4f13e48920a743237390a6
# Parent  44d086f5e08a7ca9fb8a0857d8abe3d0109253a9
* term/x-win.el (x-clipboard-yank): Don't exit on error from
  x-get-selection.

diff -r 44d086f5e08a -r b925746ed8e7 lisp/ChangeLog
--- 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.
diff -r 44d086f5e08a -r b925746ed8e7 lisp/term/x-win.el
--- 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))