changeset 17420:782c3dac70b1

(elp-functionp): Definitions deleted; use functionp.
author Richard M. Stallman <rms@gnu.org>
date Sat, 12 Apr 1997 19:15:11 +0000
parents c9f73399244c
children 28ec3ecb171e
files lisp/emacs-lisp/elp.el
diffstat 1 files changed, 1 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emacs-lisp/elp.el	Sat Apr 12 19:14:18 1997 +0000
+++ b/lisp/emacs-lisp/elp.el	Sat Apr 12 19:15:11 1997 +0000
@@ -206,22 +206,6 @@
 (defvar elp-master nil
   "Master function symbol.")
 
-
-;; 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))))
-
-
 ;;;###autoload
 (defun elp-instrument-function (funsym)
   "Instrument FUNSYM for profiling.
@@ -321,7 +305,7 @@
     ;; 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)))))