procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bytecomp.el fix for bug#8647

Browse source 
* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):
Let byte-compile-initial-macro-environment always take precedence.
This commit is contained in:
Glenn Morris 2011-05-11 19:36:05 -07:00
parent 488086f4dd
commit d45885f7e0
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-05-12 Glenn Morris <rgm@gnu.org>
* emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):
Let byte-compile-initial-macro-environment always take precedence.
2011-05-12 Stefan Monnier <monnier@iro.umontreal.ca>
* net/rcirc.el: Add support for SSL/TLS connections.

6
lisp/emacs-lisp/bytecomp.el
View file

@ -2421,7 +2421,11 @@ by side-effects."
(let* ((code (byte-compile-lambda (nthcdr 2 form) t)))
(if this-one
(setcdr this-one code)
;; A definition in b-c-initial-m-e should always take precedence
;; during compilation, so don't let it be redefined. (Bug#8647)
(or (and macrop
(assq name byte-compile-initial-macro-environment))
(setcdr this-one code))
(set this-kind
(cons (cons name code)
(symbol-value this-kind))))