From 7d3b9d44989043a707d936561613a4d5afcd47f4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 11 May 2011 09:31:33 -0700 Subject: [PATCH] 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. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/bytecomp.el | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ac18b35348..642c3fa9e7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-11 Glenn Morris + + * emacs-lisp/bytecomp.el (byte-compile-arglist-warn): + Handle symbol elements of byte-compile-initial-macro-environment. + 2011-05-10 Leo Liu * bookmark.el (bookmark-bmenu-mode-map): Bind diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 6ca8eed8ac6..e8d8993044c 100644 --- 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)) -- 2.39.2