User: aidan Date: 05/03/12 21:57:48 Modified: xemacs/lisp ChangeLog select.el Log: Fabrice Popineau's select fix for win32, plus a logic error on my part. Revision Changes Path 1.652 +8 -0 XEmacs/xemacs/lisp/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.651 retrieving revision 1.652 diff -u -r1.651 -r1.652 --- ChangeLog 2005/03/11 19:21:46 1.651 +++ ChangeLog 2005/03/12 20:57:40 1.652 ＠＠ -1,3 +1,11 ＠＠ +2005-03-12 Fabrice Popineau <Fabrice.Popineau(a)supelec.fr&gt; + + * select.el (get-selection): As described in + u0nj9nvq.fsf(a)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(a)xemacs.org&gt; * XEmacs 21.5.20 "cilantro" is released. 1.15 +3 -2 XEmacs/xemacs/lisp/select.el Index: select.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/select.el,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- select.el 2005/03/01 00:21:18 1.14 +++ select.el 2005/03/12 20:57:42 1.15 ＠＠ -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)))