(functionp): Don't consider macros as functions.

2 files changed, 6 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93fd9913af9..b6f13da44fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-09  Miles Bader  <miles@gnu.org>
+
+        * subr.el (functionp): Don't consider macros as functions.
+
 2001-11-08  Miles Bader  <miles@gnu.org>
 
         * subr.el (functionp): Make work correctly for macros and unbound
diff --git a/lisp/subr.el b/lisp/subr.el
index 27812d690cd..46f154df6ce 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1538,12 +1538,9 @@ configuration."
            (fboundp object)
            (setq object (indirect-function object))
            (eq (car-safe object) 'autoload)
-           (not (eq (car-safe
-                     (cdr-safe (cdr-safe (cdr-safe (cdr-safe object)))))
-                    'keymap)))
+           (not (car-safe (cdr-safe (cdr-safe (cdr-safe (cdr-safe object)))))))
       (subrp object) (byte-code-function-p object)
-      (eq (car-safe object) 'lambda)
-      (eq (car-safe object) 'macro)))
+      (eq (car-safe object) 'lambda)))
 
 (defun interactive-form (function)
   "Return the interactive form of FUNCTION.