* lisp/emacs-lisp/bytecomp.el: Require cl-extra.

* lisp/emacs-lisp/cl-extra.el: Add missing provide.

Fixes: debbugs:18804

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1f8fdcdd584301234e6e9a25a5a2fccae42640e..d5c5458facfbe2c78dd848ba8c1ce1024476bd1e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/bytecomp.el: Require cl-extra (bug#18804).
+       * emacs-lisp/cl-extra.el: Add missing provide.
+
 2014-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/bytecomp.el (byte-compile-and-folded): Optimize case where

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 6ab0efff86b1213801dae96fe39eb8c53c0c809b..a4f26efa02745599d77a3f4af0417751aa4932de 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -120,7 +120,11 @@
 (require 'backquote)
 (require 'macroexp)
 (require 'cconv)
-(require 'cl-lib)
+
+;; During bootstrap, cl-loaddefs.el is not created yet, so loading cl-lib
+;; doesn't setup autoloads for things like cl-every, which is why we have to
+;; require cl-extra instead (bug#18804).
+(require 'cl-extra)
 
 (or (fboundp 'defsubst)
     ;; This really ought to be loaded already!

diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 9b28289e0b92aee5d21f9e9af436f05ad27543b3..e1919c3bb8d6e13391469189fb5bc394a944806b 100644 (file)
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -700,4 +700,5 @@ including `cl-block' and `cl-eval-when'."
 ;; generated-autoload-file: "cl-loaddefs.el"
 ;; End:
 
+(provide 'cl-extra)
 ;;; cl-extra.el ends here