diff options
| author | Stefan Monnier | 2020-07-06 18:04:54 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2020-07-06 18:04:54 -0400 |
| commit | 6b80ff3c465f87a31ccaaf41b2b521075f43632d (patch) | |
| tree | 2097ebd905825e6644e1a2b2516580b5ffdfd69d | |
| parent | 3f990c3cccf85e64399bf98ea3e61cb618e8455c (diff) | |
| download | emacs-6b80ff3c465f87a31ccaaf41b2b521075f43632d.tar.gz emacs-6b80ff3c465f87a31ccaaf41b2b521075f43632d.zip | |
* lisp/emacs-lisp/cl-macs.el (cl-deftype-satisfies): Add `keyword`
| -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." | |||
| 3138 | (cdr (assq sym byte-compile-macro-environment)))))) | 3138 | (cdr (assq sym byte-compile-macro-environment)))))) |
| 3139 | 3139 | ||
| 3140 | (pcase-dolist (`(,type . ,pred) | 3140 | (pcase-dolist (`(,type . ,pred) |
| 3141 | '((null . null) | 3141 | ;; Mostly kept in alphabetical order. |
| 3142 | '((array . arrayp) | ||
| 3142 | (atom . atom) | 3143 | (atom . atom) |
| 3143 | (real . numberp) | ||
| 3144 | (fixnum . integerp) | ||
| 3145 | (base-char . characterp) | 3144 | (base-char . characterp) |
| 3145 | (boolean . booleanp) | ||
| 3146 | (bool-vector . bool-vector-p) | ||
| 3147 | (buffer . bufferp) | ||
| 3146 | (character . natnump) | 3148 | (character . natnump) |
| 3147 | ;; "Obvious" mappings. | 3149 | (char-table . char-table-p) |
| 3148 | (string . stringp) | ||
| 3149 | (list . listp) | ||
| 3150 | (cons . consp) | 3150 | (cons . consp) |
| 3151 | (symbol . symbolp) | 3151 | (fixnum . integerp) |
| 3152 | (float . floatp) | ||
| 3152 | (function . functionp) | 3153 | (function . functionp) |
| 3153 | (integer . integerp) | 3154 | (integer . integerp) |
| 3154 | (float . floatp) | 3155 | (keyword . keywordp) |
| 3155 | (boolean . booleanp) | 3156 | (list . listp) |
| 3157 | (number . numberp) | ||
| 3158 | (null . null) | ||
| 3159 | (real . numberp) | ||
| 3160 | (sequence . sequencep) | ||
| 3161 | (string . stringp) | ||
| 3162 | (symbol . symbolp) | ||
| 3156 | (vector . vectorp) | 3163 | (vector . vectorp) |
| 3157 | (array . arrayp) | ||
| 3158 | ;; FIXME: Do we really want to consider this a type? | 3164 | ;; FIXME: Do we really want to consider this a type? |
| 3159 | (integer-or-marker . integer-or-marker-p) | 3165 | (integer-or-marker . integer-or-marker-p) |
| 3160 | )) | 3166 | )) |