--- a/lisp/subr.el	Mon Aug 13 11:06:08 2007 +0200
+++ b/lisp/subr.el	Mon Aug 13 11:07:10 2007 +0200
@@ -88,9 +88,6 @@
 ;; XEmacs: not used.
 
 ;; XEmacs:
-(define-function 'not 'null)
-(define-function-when-void 'numberp 'integerp) ; different when floats
-
 (defun local-variable-if-set-p (sym buffer)
   "Return t if SYM would be local to BUFFER after it is set.
 A nil value for BUFFER is *not* the same as (current-buffer), but
@@ -586,12 +583,14 @@
                                          (cons (cons name defs)
                                                abbrev-table-name-list)))))))
 
-(defun functionp (object)
-  "Non-nil if OBJECT can be called as a function."
-  (or (and (symbolp object) (fboundp object))
-      (subrp object)
-      (compiled-function-p object)
-      (eq (car-safe object) 'lambda)))
+;;; `functionp' has been moved into C.
+
+;;(defun functionp (object)
+;;  "Non-nil if OBJECT can be called as a function."
+;;  (or (and (symbolp object) (fboundp object))
+;;      (subrp object)
+;;      (compiled-function-p object)
+;;      (eq (car-safe object) 'lambda)))