--- a/lisp/prim/subr.el	Mon Aug 13 10:02:48 2007 +0200
+++ b/lisp/prim/subr.el	Mon Aug 13 10:03:52 2007 +0200
@@ -396,6 +396,12 @@
 (define-function 'string< 'string-lessp)
 (define-function 'int-to-string 'number-to-string)
 (define-function 'string-to-int 'string-to-number)
+
+;; These two names are a bit awkward, as they conflict with the normal
+;; foo-to-bar naming scheme, but CLtL2 has them, so they stay.
+(define-function 'char-int 'char-to-int)
+(define-function 'int-char 'int-to-char)
+
 
 ;; alist/plist functions
 (defun plist-to-alist (plist)
@@ -572,7 +578,7 @@
                                                abbrev-table-name-list)))))))
 
 (defun functionp (obj)
-  "Returns t if OBJ is a function, nil otherwise."
+  "Non-nil if OBJECT is a type of object that can be called as a function."
   (cond
    ((symbolp obj) (fboundp obj))
    ((subrp obj))