diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-06-20 16:01:51 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-06-20 16:01:51 -0400 |
| commit | aff6371e3281f4da696093806b1658cb48670a76 (patch) | |
| tree | a717343bdf3ad629de46a3bf9255b834dfea7e9b /lisp/emacs-lisp/cl-lib.el | |
| parent | 1fc7100890ced39f81a822661439b1f7030df5a1 (diff) | |
| download | emacs-aff6371e3281f4da696093806b1658cb48670a76.tar.gz emacs-aff6371e3281f4da696093806b1658cb48670a76.tar.bz2 emacs-aff6371e3281f4da696093806b1658cb48670a76.zip | |
* 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.
Diffstat (limited to 'lisp/emacs-lisp/cl-lib.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-lib.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 2a776b79705..2ab6b7ad089 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/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 |