diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-04-18 20:52:22 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-04-18 20:52:22 -0400 |
| commit | b6a57fb80c49bcd9163966d612671a5256f3a1a8 (patch) | |
| tree | ad2235dc4239a223228c18898ae5d8f5e3b4731f | |
| parent | 0f8343394675480f18c121520eed2203bbe1d6ec (diff) | |
| download | emacs-b6a57fb80c49bcd9163966d612671a5256f3a1a8.tar.gz | |
Tweak bytecomp's loading of cl-extra
* lisp/emacs-lisp/bytecomp.el: Don't force load of cl-extra in a
post-bootstrap emacs where cl-loaddefs does exist.
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 2c2996ebab4..f0f938da43f 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -124,11 +124,13 @@ (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) +;; require cl-extra as well (bug#18804). +(or (fboundp 'cl-every) + (require 'cl-extra)) (or (fboundp 'defsubst) ;; This really ought to be loaded already! |