From: Glenn Morris <rgm@gnu.org>
Date: Wed, 19 Apr 2017 00:52:22 +0000 (-0400)
Subject: Tweak bytecomp's loading of cl-extra
X-Git-Tag: emacs-26.0.90~521^2~597
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6a57fb80c49bcd9163966d612671a5256f3a1a8;p=emacs.git

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.
---

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!