--- a/lisp/cl-extra.el	Mon Aug 13 11:00:13 2007 +0200
+++ b/lisp/cl-extra.el	Mon Aug 13 11:01:07 2007 +0200
@@ -74,8 +74,8 @@
 	((eq type 'array) (if (arrayp x) x (vconcat x)))
 	((and (eq type 'character) (stringp x) (= (length x) 1)) (aref x 0))
 	((and (eq type 'character) (symbolp x)) (coerce (symbol-name x) type))
-	((and (eq type 'character) (numberp x) (char-or-char-int-p x)
-	      (int-char x)))
+	((and (eq type 'character) (char-int-p x)) (int-char x))
+	((and (eq type 'integer) (characterp x)) (char-int x))
 	((eq type 'float) (float x))
 	((eq type 'bit-vector) (if (bit-vector-p x) x
 				 (apply 'bit-vector (append x nil))))