diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-07-07 20:44:39 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-07-07 20:44:39 +0100 |
| commit | 3d43d45755b2c38d5378496ff6b0fc40538ee924 (patch) | |
| tree | ee43ee3f19bc6ef5cb37c2462c6876584e01364b /lisp/emacs-lisp/cl-macs.el | |
| parent | 2593bbee51f4d15d3a4fc1d4e2e3b215222f783a (diff) | |
| parent | df3ece9d2ed61c9526dbf718e3c96d72bd53dccb (diff) | |
| download | emacs-3d43d45755b2c38d5378496ff6b0fc40538ee924.tar.gz emacs-3d43d45755b2c38d5378496ff6b0fc40538ee924.tar.bz2 emacs-3d43d45755b2c38d5378496ff6b0fc40538ee924.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/cl-macs.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index a3e72c4b00d..6c1426ce5cb 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el @@ -3138,23 +3138,29 @@ Of course, we really can't know that for sure, so it's just a heuristic." (cdr (assq sym byte-compile-macro-environment)))))) (pcase-dolist (`(,type . ,pred) - '((null . null) + ;; Mostly kept in alphabetical order. + '((array . arrayp) (atom . atom) - (real . numberp) - (fixnum . integerp) (base-char . characterp) + (boolean . booleanp) + (bool-vector . bool-vector-p) + (buffer . bufferp) (character . natnump) - ;; "Obvious" mappings. - (string . stringp) - (list . listp) + (char-table . char-table-p) (cons . consp) - (symbol . symbolp) + (fixnum . integerp) + (float . floatp) (function . functionp) (integer . integerp) - (float . floatp) - (boolean . booleanp) + (keyword . keywordp) + (list . listp) + (number . numberp) + (null . null) + (real . numberp) + (sequence . sequencep) + (string . stringp) + (symbol . symbolp) (vector . vectorp) - (array . arrayp) ;; FIXME: Do we really want to consider this a type? (integer-or-marker . integer-or-marker-p) )) |