[Emacs-diffs] /srv/bzr/emacs/trunk r110510: Fix spurious "cl--defsubst-expand might not be defined at runtime"

[Stefan Monnier]

------------------------------------------------------------
revno: 110510
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-10-11 16:08:38 -0400
message:
  Fix spurious "cl--defsubst-expand might not be defined at runtime"
  * lisp/emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
  changes to the format of load-history.
  * src/eval.c (Fautoload): Remember previous autoload status in load-history.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/bytecomp.el
  src/ChangeLog
  src/eval.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-11 20:05:47 +0000
+++ b/lisp/ChangeLog    2012-10-11 20:08:38 +0000
@@ -1,5 +1,8 @@
 2012-10-11  Stefan Monnier  <address@hidden>
 
+       * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
+       changes to the format of load-history.
+
        * international/mule-cmds.el (read-char-by-name): Move let-binding of
        completion-ignore-case in case that var is buffer-local (bug#12615).
 

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2012-10-01 04:45:32 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2012-10-11 20:08:38 +0000
@@ -875,13 +875,11 @@
                               (byte-compile-cl-file-p (car xs))))
                (dolist (s xs)
                  (cond
-                  ((symbolp s)
-                   (unless (memq s old-autoloads)
-                     (push s byte-compile-noruntime-functions)))
                   ((and (consp s) (eq t (car s)))
                    (push (cdr s) old-autoloads))
-                  ((and (consp s) (eq 'autoload (car s)))
-                   (push (cdr s) byte-compile-noruntime-functions)))))))
+                  ((and (consp s) (memq (car s) '(autoload defun)))
+                   (unless (memq (cdr s) old-autoloads)
+                      (push (cdr s) byte-compile-noruntime-functions))))))))
          ;; Go through current-load-list for the locally defined funs.
          (let (old-autoloads)
            (while (and hist-nil-new (not (eq hist-nil-new hist-nil-orig)))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-11 16:23:37 +0000
+++ b/src/ChangeLog     2012-10-11 20:08:38 +0000
@@ -1,3 +1,7 @@
+2012-10-11  Stefan Monnier  <address@hidden>
+
+       * eval.c (Fautoload): Remember previous autoload status in load-history.
+
 2012-10-11  Paul Eggert  <address@hidden>
 
        lread.c, macros.c, marker.c, menu.c, minibuf.c: Use bool for booleans.

=== modified file 'src/eval.c'
--- a/src/eval.c        2012-10-01 06:36:54 +0000
+++ b/src/eval.c        2012-10-11 20:08:38 +0000
@@ -1876,9 +1876,11 @@
   CHECK_STRING (file);
 
   /* If function is defined and not as an autoload, don't override.  */
-  if (!EQ (XSYMBOL (function)->function, Qunbound)
-      && !(CONSP (XSYMBOL (function)->function)
-          && EQ (XCAR (XSYMBOL (function)->function), Qautoload)))
+  if ((CONSP (XSYMBOL (function)->function)
+       && EQ (XCAR (XSYMBOL (function)->function), Qautoload)))
+    /* Remember that the function was already an autoload.  */
+    LOADHIST_ATTACH (Fcons (Qt, function));
+  else if (!EQ (XSYMBOL (function)->function, Qunbound))
     return Qnil;
 
   if (NILP (Vpurify_flag))