diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-23 09:31:20 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-23 09:31:20 -0400 |
| commit | acc443ad03bf46aa49c87bc93f2df836bedede94 (patch) | |
| tree | 6087f8069c7ac991733284f4927aaa825da12310 /lisp/emacs-lisp | |
| parent | e5dc30bfd37122d04be3b4cdf62b25215684856d (diff) | |
| download | emacs-acc443ad03bf46aa49c87bc93f2df836bedede94.tar.gz emacs-acc443ad03bf46aa49c87bc93f2df836bedede94.tar.bz2 emacs-acc443ad03bf46aa49c87bc93f2df836bedede94.zip | |
* lisp/emacs-lisp/bytecomp.el: Require cl-extra.
* lisp/emacs-lisp/cl-extra.el: Add missing provide.
Fixes: debbugs:18804
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-extra.el | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 6ab0efff86b..a4f26efa027 100644 --- 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 9b28289e0b9..e1919c3bb8d 100644 --- 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 |