From: Miles Bader <miles@gnu.org>
Date: Fri, 9 Nov 2001 01:03:03 +0000 (+0000)
Subject: (functionp): Don't consider macros as functions.
X-Git-Tag: ttn-vms-21-2-B4~18739
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60ab6064b3a85227ab7ac419783a9de5533f4dbc;p=emacs.git

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

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.