(elp-functionp): Definitions deleted; use functionp.

diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 5208431112460b23c911fa7316993d9735a9fc6b..d6bac0697a63791013193207e9d7e8c81d6664ef 100644 (file)
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -206,22 +206,6 @@ This variable is set by the master function.")
 (defvar elp-master nil
   "Master function symbol.")
 
-\f
-;; Emacs/XEmacs compatibility.
-(if (fboundp 'functionp)
-    (defalias 'elp-functionp 'functionp)
-  ;; Lift XEmacs 19.13's functionp from subr.el
-  (defun elp-functionp (obj)
-    "Returns t if OBJ is a function, nil otherwise."
-    (cond
-     ((symbolp obj) (fboundp obj))
-     ((subrp obj))
-     ((compiled-function-p obj))
-     ((consp obj)
-      (if (eq (car obj) 'lambda) (listp (car (cdr obj)))))
-     (t nil))))
-
-\f
 ;;;###autoload
 (defun elp-instrument-function (funsym)
   "Instrument FUNSYM for profiling.
@@ -321,7 +305,7 @@ Argument FUNSYM is the symbol of a defined function."
     ;; we don't want to destroy the new definition.  can it ever be
     ;; the case that a lisp function can be compiled instrumented?
     (and info
-        (elp-functionp funsym)
+        (functionp funsym)
         (not (compiled-function-p (symbol-function funsym)))
         (assq 'elp-wrapper (symbol-function funsym))
         (fset funsym (aref info 2)))))