Mercurial > hg > xemacs-beta
diff lisp/cl-macs.el @ 5437:002cb5224e4f
Merge with 21.5 trunk.
author | Mats Lidell <matsl@xemacs.org> |
---|---|
date | Mon, 15 Nov 2010 22:33:52 +0100 |
parents | b9167d522a9a ec05a30f7148 |
children | 8d29f1c4bb98 |
line wrap: on
line diff
--- a/lisp/cl-macs.el Sat Nov 13 00:15:58 2010 +0100 +++ b/lisp/cl-macs.el Mon Nov 15 22:33:52 2010 +0100 @@ -3268,7 +3268,6 @@ (defun cl-non-fixnum-number-p (object) (and (numberp object) (not (fixnump object)))) -(put 'eql 'byte-compile nil) (define-compiler-macro eql (&whole form a b) (cond ((eq (cl-const-expr-p a) t) (let ((val (cl-const-expr-val a))) @@ -3280,15 +3279,6 @@ (if (cl-non-fixnum-number-p val) (list 'equal a b) (list 'eq a b)))) - ((cl-simple-expr-p a 5) - (list 'if (list 'numberp a) - (list 'equal a b) - (list 'eq a b))) - ((and (cl-safe-expr-p a) - (cl-simple-expr-p b 5)) - (list 'if (list 'numberp b) - (list 'equal a b) - (list 'eq a b))) (t form))) (macrolet