* lisp/emacs-lisp/cl-loaddefs.el: Don't version-control any more.

* lisp/emacs-lisp/cl-lib.el: Load cl-macs when cl-loaddefs is not
yet available.
* lisp/Makefile.in (AUTOGEN_VCS): Move cl-loaddefs.el...
(AUTOGENEL): ... here.
* lisp/emacs-lisp/cl-macs.el (cl--sublis): New function.
(cl--defsubst-expand): Use it.
* .bzrignore: Don't unignore cl-loaddefs.el.

ChangeLog

@@ -1,3 +1,7 @@
+2013-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* .bzrignore: Don't unignore cl-loaddefs.el.
+
 2013-06-20  Rüdiger Sonderfeld <ruediger@c-plusplus.de>
 
 	* configure.ac (log2): Check for this function.

lisp/ChangeLog

@@ -1,3 +1,13 @@
+2013-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/cl-loaddefs.el: Don't version-control any more.
+	* emacs-lisp/cl-lib.el: Load cl-macs when cl-loaddefs is not
+	yet available.
+	* Makefile.in (AUTOGEN_VCS): Move cl-loaddefs.el...
+	(AUTOGENEL): ... here.
+	* emacs-lisp/cl-macs.el (cl--sublis): New function.
+	(cl--defsubst-expand): Use it.
+
 2013-06-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* subr.el (log10): Move here from C code, and declare as obsolete.

lisp/Makefile.in

@@ -68,6 +68,7 @@ AUTOGENEL = loaddefs.el \
 	cus-load.el \
 	finder-inf.el \
 	subdirs.el \
+	emacs-lisp/cl-loaddefs.el \
 	calc/calc-loaddefs.el \
 	eshell/esh-groups.el \
 	cedet/semantic/loaddefs.el \
@@ -79,7 +80,6 @@ AUTOGENEL = loaddefs.el \
 AUTOGEN_VCS = \
 	ps-print.el \
 	emulation/tpu-edt.el \
-	emacs-lisp/cl-loaddefs.el \
 	mail/rmail.el \
 	dired.el \
 	ibuffer.el \

lisp/emacs-lisp/cl-lib.el

@@ -725,9 +725,10 @@ If ALIST is non-nil, the new pairs are prepended to it."
   (put 'cl-defsubst 'doc-string-elt 3)
   (put 'cl-defstruct 'doc-string-elt 2))
 
-(load "cl-loaddefs" nil 'quiet)
-
 (provide 'cl-lib)
+(or (load "cl-loaddefs" 'noerror 'quiet)
+    ;; When bootstrapping, cl-loaddefs hasn't been built yet!
+    (require 'cl-macs))
 
 ;; Local variables:
 ;; byte-compile-dynamic: t

lisp/emacs-lisp/cl-macs.el

@@ -2739,9 +2739,17 @@ surrounded by (cl-block NAME ...).
       (setq body (cond ((null substs) body)
                        ((null (cdr substs))
                         (cl-subst (cdar substs) (caar substs) body))
-                       (t (cl-sublis substs body))))
+                       (t (cl--sublis substs body))))
       (if lets `(let ,lets ,body) body))))
 
+(defun cl--sublis (alist tree)
+  "Perform substitutions indicated by ALIST in TREE (non-destructively)."
+  (let ((x (assq tree alist)))
+    (cond
+     (x (cdr x))
+     ((consp tree)
+      (cons (cl--sublis alist (car tree)) (cl--sublis alist (cdr tree))))
+     (t tree))))
 
 ;; Compile-time optimizations for some functions defined in this package.