bytecomp.el partial fix for bug#8646.

* lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-warn):
Handle symbol elements of byte-compile-initial-macro-environment.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ac18b353485b2b29bacba0edae525159d945ecf..642c3fa9e7b04b610f0769a1c52d65c436c714a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-11  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/bytecomp.el (byte-compile-arglist-warn):
+       Handle symbol elements of byte-compile-initial-macro-environment.
+
 2011-05-10  Leo Liu  <sdl.web@gmail.com>
 
        * bookmark.el (bookmark-bmenu-mode-map): Bind

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 6ca8eed8ac6c63a460742e458cc29ff6c40c009d..e8d8993044c2f7b2e70e5f1458acb0ddb620809e 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1314,7 +1314,15 @@ extra args."
 ;; number of arguments.
 (defun byte-compile-arglist-warn (form macrop)
   (let* ((name (nth 1 form))
-         (old (byte-compile-fdefinition name macrop)))
+         (old (byte-compile-fdefinition name macrop))
+         (initial (and macrop
+                       (cdr (assq name
+                                  byte-compile-initial-macro-environment)))))
+    ;; Assumes an element of b-c-i-macro-env that is a symbol points
+    ;; to a defined function.  (Bug#8646)
+    (and initial (symbolp initial)
+         (setq old (byte-compile-fdefinition initial nil)
+               initial 'yes))
     (if (and old (not (eq old t)))
        (progn
          (and (eq 'macro (car-safe old))