Merge from emacs--devo--0

[gnu-emacs] / lisp / emacs-lisp / cl-macs.el

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 17da9cc515424633ee06cb3a39828ec1051c9bdc..9dc0bbc4abb28d33c408688fa5400a2b00edb6be 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2452,7 +2452,7 @@ The type name can then be used in `typecase', `check-type', etc."
            ((eq type 'real) `(numberp ,val))
            ((eq type 'fixnum) `(integerp ,val))
            ;; FIXME: Should `character' accept things like ?\C-\M-a ?  -stef
-           ((memq type '(character string-char)) `(char-valid-p ,val))
+           ((memq type '(character string-char)) `(characterp ,val))
            (t
             (let* ((name (symbol-name type))
                    (namep (intern (concat name "p"))))