[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b6a57fb: Tweak bytecomp's loading of cl-extra
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master b6a57fb: Tweak bytecomp's loading of cl-extra |
Date: |
Tue, 18 Apr 2017 20:52:34 -0400 (EDT) |
branch: master
commit b6a57fb80c49bcd9163966d612671a5256f3a1a8
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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.
---
lisp/emacs-lisp/bytecomp.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 2c2996e..f0f938d 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!
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b6a57fb: Tweak bytecomp's loading of cl-extra,
Glenn Morris <=