]> code.delx.au - gnu-emacs/commitdiff
Fix bootstrap (void function cl-member).
authorGlenn Morris <rgm@gnu.org>
Wed, 13 May 2015 23:02:31 +0000 (19:02 -0400)
committerGlenn Morris <rgm@gnu.org>
Wed, 13 May 2015 23:02:31 +0000 (19:02 -0400)
* 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
lisp/emacs-lisp/cl-seq.el

index 6b43c126130ed97b5df9eebd8b0fed5d201c293c..b6f3a793be67fe119586b27bdc13d36d4f99f72c 100644 (file)
@@ -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
index 5624accf66a6a4dbdf69450d24a2dd1891243192..3aea67ad11b40221d3206ce8deb40fbb2b57350a 100644 (file)
@@ -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