Mercurial > hg > xemacs-beta
changeset 2656:0ba09d009197
[xemacs-hg @ 2005-03-12 20:57:40 by aidan]
Fabrice Popineau's select fix for win32, plus a logic error on my part.
| author | aidan |
|---|---|
| date | Sat, 12 Mar 2005 20:57:42 +0000 |
| parents | 4769b9c268eb |
| children | 48e27e1d7e63 |
| files | lisp/ChangeLog lisp/select.el |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)))