[Emacs-diffs] /srv/bzr/emacs/trunk r104200: bytecomp.el fix for bug#8647

[Glenn Morris]

------------------------------------------------------------
revno: 104200
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-11 19:36:05 -0700
message:
  bytecomp.el fix for bug#8647
  
  * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):
  Let byte-compile-initial-macro-environment always take precedence.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-12 02:25:58 +0000
+++ b/lisp/ChangeLog    2011-05-12 02:36:05 +0000
@@ -1,3 +1,8 @@
+2011-05-12  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):
+       Let byte-compile-initial-macro-environment always take precedence.
+
 2011-05-12  Stefan Monnier  <address@hidden>
 
        * net/rcirc.el: Add support for SSL/TLS connections.

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2011-05-11 17:32:38 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2011-05-12 02:36:05 +0000
@@ -2421,7 +2421,11 @@
 
     (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))))