diff options
| author | Miles Bader <miles@gnu.org> | 2005-07-22 08:27:27 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-07-22 08:27:27 +0000 |
| commit | 3674ae2f87e47a654524af689ea610ee3edeaca7 (patch) | |
| tree | 58ea33c40c8521a79fb503080b8bb6231ffbf579 /lisp/emacs-lisp/cl-macs.el | |
| parent | 3e03f554f116e04ba860dcde7c6d862939911e16 (diff) | |
| parent | 7929f858f8897f0448771a471f8afc5f244e4bca (diff) | |
| download | emacs-3674ae2f87e47a654524af689ea610ee3edeaca7.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 485-492)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 92-94)
- Merge from emacs--cvs-trunk--0
- Update from CVS
Diffstat (limited to 'lisp/emacs-lisp/cl-macs.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index bc60bee0374..95d1846b30b 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -2384,6 +2384,7 @@ The type name can then be used in `typecase', `check-type', etc." (cl-make-type-test val (funcall (get type 'cl-deftype-handler)))) ((memq type '(nil t)) type) ((eq type 'null) `(null ,val)) + ((eq type 'atom) `(atom ,val)) ((eq type 'float) `(floatp-safe ,val)) ((eq type 'real) `(numberp ,val)) ((eq type 'fixnum) `(integerp ,val)) @@ -2398,7 +2399,7 @@ The type name can then be used in `typecase', `check-type', etc." (cl-make-type-test val (apply (get (car type) 'cl-deftype-handler) (cdr type)))) ((memq (car type) '(integer float real number)) - (delq t (and (cl-make-type-test val (car type)) + (delq t (list 'and (cl-make-type-test val (car type)) (if (memq (cadr type) '(* nil)) t (if (consp (cadr type)) (list '> val (caadr type)) (list '>= val (cadr type)))) |