emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 912d4a4: Fix bootstrap (void function cl-member).


From: Glenn Morris
Subject: [Emacs-diffs] master 912d4a4: Fix bootstrap (void function cl-member).
Date: Wed, 13 May 2015 23:02:35 +0000

branch: master
commit 912d4a4935c2ef0854df2b709ccd00710415ff1d
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Fix bootstrap (void function cl-member).
    
    * lisp/emacs-lisp/cl-lib.el: Load cl-seq if no cl-loaddefs file.
    * lisp/emacs-lisp/cl-seq.el: Provide a feature.
---
 lisp/emacs-lisp/cl-lib.el |    7 ++++---
 lisp/emacs-lisp/cl-seq.el |    2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 6b43c12..b6f3a79 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -731,9 +731,10 @@ If ALIST is non-nil, the new pairs are prepended to it."
 ;;; Miscellaneous.
 
 (provide 'cl-lib)
-(or (load "cl-loaddefs" 'noerror 'quiet)
-    ;; When bootstrapping, cl-loaddefs hasn't been built yet!
-    (require 'cl-macs))
+(unless (load "cl-loaddefs" 'noerror 'quiet)
+  ;; When bootstrapping, cl-loaddefs hasn't been built yet!
+  (require 'cl-macs)
+  (require 'cl-seq))
 
 ;; Local variables:
 ;; byte-compile-dynamic: t
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index 5624acc..3aea67a 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -1018,4 +1018,6 @@ Atoms are compared by `eql'; cons cells are compared 
recursively.
 ;; generated-autoload-file: "cl-loaddefs.el"
 ;; End:
 
+(provide 'cl-seq)
+
 ;;; cl-seq.el ends here



reply via email to

[Prev in Thread] Current Thread [Next in Thread]