# HG changeset patch
# User aidan
# Date 1110661062 0
# Node ID 0ba09d0091974d46ef7e8f9c5326115c84d20531
# Parent  4769b9c268ebdddbb0d32afaa1f7167dc6d3ef60
[xemacs-hg @ 2005-03-12 20:57:40 by aidan]
Fabrice Popineau's select fix for win32, plus a logic error on my part.

diff -r 4769b9c268eb -r 0ba09d009197 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Mar 12 11:00:29 2005 +0000
+++ b/lisp/ChangeLog	Sat Mar 12 20:57:42 2005 +0000
@@ -1,3 +1,11 @@
+2005-03-12  Fabrice Popineau <Fabrice.Popineau@supelec.fr> 
+
+	* select.el (get-selection): As described in
+	u0nj9nvq.fsf@esemetz.metz.supelec.fr , get-selection-internal
+	returns nil instead of signalling a selection-conversion
+	error on win32. Also, Aidan had a logic error while traversing a
+	list. 
+
 2005-03-11  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.20 "cilantro" is released.
diff -r 4769b9c268eb -r 0ba09d009197 lisp/select.el
--- a/lisp/select.el	Sat Mar 12 11:00:29 2005 +0000
+++ b/lisp/select.el	Sat Mar 12 20:57:42 2005 +0000
@@ -146,10 +146,11 @@
 	    (condition-case err
 		(progn
 		  (setq res (get-selection-internal type (car data-type)))
-		  (throw 'converted res))
+		  (if res (throw 'converted res) 
+		    (signal 'selection-conversion-error nil)))
 	      (selection-conversion-error
 	       (if (cdr data-type)
-		   (setq data-type (pop data-type))
+		   (setq data-type (cdr data-type))
 		 (signal (car err) (cdr err))))))))
     (get-selection-internal type data-type)))