* lisp/emacs-lisp/comp.el (comp-known-predicates): Some more tweaking.

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 455fd72efcd560895da629a3621791a774bf4c31..3247b19c5e24e73f7f6c6b63916a3dccf759c4d9 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -503,15 +503,15 @@ Useful to hook into pass checkers.")
 (defconst comp-known-predicates
   '((arrayp              . array)
     (atom               . atom)
-    (characterp          . base-char)
+    (characterp          . fixnum)
     (booleanp            . boolean)
     (bool-vector-p       . bool-vector)
     (bufferp             . buffer)
-    (natnump             . character)
+    (natnump             . (integer 0 *))
     (char-table-p       . char-table)
     (hash-table-p       . hash-table)
     (consp               . cons)
-    (integerp            . fixnum)
+    (integerp            . integer)
     (floatp              . float)
     (functionp           . (or function symbol))
     (integerp            . integer)
@@ -519,7 +519,7 @@ Useful to hook into pass checkers.")
     (listp               . list)
     (numberp             . number)
     (null               . null)
-    (numberp             . real)
+    (numberp             . number)
     (sequencep           . sequence)
     (stringp             . string)
     (symbolp             . symbol)