Mercurial > hg > xemacs-beta
diff lisp/cl-seq.el @ 5125:b5df3737028a ben-lisp-object
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Feb 2010 01:58:04 -0600 |
parents | 6772ce4d982b |
children | 545ec923b4eb |
line wrap: on
line diff
--- a/lisp/cl-seq.el Wed Jan 20 07:05:57 2010 -0600 +++ b/lisp/cl-seq.el Wed Feb 24 01:58:04 2010 -0600 @@ -664,7 +664,7 @@ (while (and cl-list (not (cl-check-test cl-item (car cl-list)))) (setq cl-list (cdr cl-list))) cl-list) - (if (and (numberp cl-item) (not (integerp cl-item))) + (if (and (numberp cl-item) (not (fixnump cl-item))) (member cl-item cl-list) (memq cl-item cl-list)))) @@ -697,7 +697,7 @@ (not (cl-check-test cl-item (car (car cl-alist)))))) (setq cl-alist (cdr cl-alist))) (and cl-alist (car cl-alist))) - (if (and (numberp cl-item) (not (integerp cl-item))) + (if (and (numberp cl-item) (not (fixnump cl-item))) (assoc cl-item cl-alist) (assq cl-item cl-alist)))) @@ -714,7 +714,7 @@ (defun rassoc* (cl-item cl-alist &rest cl-keys) "Find the first item whose cdr matches ITEM in LIST. Keywords supported: :test :test-not :key" - (if (or cl-keys (numberp cl-item)) + (if (or cl-keys (and (numberp cl-item) (not (fixnump cl-item)))) (cl-parsing-keywords (:test :test-not :key :if :if-not) () (while (and cl-alist (or (not (consp (car cl-alist)))