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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93fd9913af927904e1012d347c52942614e735dd..b6f13da44fafefd234d5ca0c9b623b3ac4b10b75 100644 (file)
--- 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 27812d690cd25777ce0a5557ee9bea9c0cbc3966..46f154df6ce553eeb6a35fc029c763a6f5195655 100644 (file)
--- 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.