[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104191: bytecomp.el partial fix for
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104191: bytecomp.el partial fix for bug#8646. |
Date: |
Wed, 11 May 2011 09:31:33 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104191
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-11 09:31:33 -0700
message:
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.
modified:
lisp/ChangeLog
lisp/emacs-lisp/bytecomp.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-10 19:34:51 +0000
+++ b/lisp/ChangeLog 2011-05-11 16:31:33 +0000
@@ -1,3 +1,8 @@
+2011-05-11 Glenn Morris <address@hidden>
+
+ * emacs-lisp/bytecomp.el (byte-compile-arglist-warn):
+ Handle symbol elements of byte-compile-initial-macro-environment.
+
2011-05-10 Leo Liu <address@hidden>
* bookmark.el (bookmark-bmenu-mode-map): Bind
=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el 2011-05-07 04:03:49 +0000
+++ b/lisp/emacs-lisp/bytecomp.el 2011-05-11 16:31:33 +0000
@@ -1314,7 +1314,15 @@
;; 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104191: bytecomp.el partial fix for bug#8646.,
Glenn Morris <=