[Emacs-diffs] trunk r113076: Check autoload's "type" argument correctly in bytecomp.el

[Glenn Morris]

------------------------------------------------------------
revno: 113076
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-19 00:35:00 -0700
message:
  Check autoload's "type" argument correctly in bytecomp.el
  
  * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-autoload):
  Only eval autoloaded macros.
  (byte-compile-autoload): Only give the macro warning for macros.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/bytecomp.el    bytecomp.el-20091113204419-o5vbwnq5f7feedwu-492

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-19 07:24:44 +0000
+++ b/lisp/ChangeLog    2013-06-19 07:35:00 +0000
@@ -1,5 +1,9 @@
 2013-06-19  Glenn Morris  <address@hidden>
 
+       * emacs-lisp/bytecomp.el (byte-compile-file-form-autoload):
+       Only eval autoloaded macros.
+       (byte-compile-autoload): Only give the macro warning for macros.
+
        * progmodes/cperl-mode.el (ps-bold-faces, ps-italic-faces)
        (ps-underlined-faces): Declare.
 

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2013-06-14 02:31:28 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2013-06-19 07:35:00 +0000
@@ -2215,7 +2215,7 @@
   (and (let ((form form))
         (while (if (setq form (cdr form)) (macroexp-const-p (car form))))
         (null form))                   ;Constants only
-       (eval (nth 5 form))             ;Macro
+       (memq (eval (nth 5 form)) '(t macro)) ;Macro
        (eval form))                    ;Define the autoload.
   ;; Avoid undefined function warnings for the autoload.
   (when (and (consp (nth 1 form))
@@ -4187,7 +4187,7 @@
   (byte-compile-set-symbol-position 'autoload)
   (and (macroexp-const-p (nth 1 form))
        (macroexp-const-p (nth 5 form))
-       (eval (nth 5 form))  ; macro-p
+       (memq (eval (nth 5 form)) '(t macro))  ; macro-p
        (not (fboundp (eval (nth 1 form))))
        (byte-compile-warn
        "The compiler ignores `autoload' except at top level.  You should