diff options
| author | Stephen Berman <stephen.berman@gmx.net> | 2013-06-21 20:37:42 +0200 |
|---|---|---|
| committer | Stephen Berman <stephen.berman@gmx.net> | 2013-06-21 20:37:42 +0200 |
| commit | 716b665eb3a134a5d1ccefd5d4c735e7e7ef62d5 (patch) | |
| tree | ede9da164267b968f3c05e0340ba12e06b8d3516 /lisp/emacs-lisp/cl-lib.el | |
| parent | ebc83885b750d46eb290192ae25f6b9a92bdd15f (diff) | |
| parent | cad5d1cb5af7210154814b60825576d14740158f (diff) | |
| download | emacs-716b665eb3a134a5d1ccefd5d4c735e7e7ef62d5.tar.gz emacs-716b665eb3a134a5d1ccefd5d4c735e7e7ef62d5.tar.bz2 emacs-716b665eb3a134a5d1ccefd5d4c735e7e7ef62d5.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/cl-lib.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-lib.el | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 52f123c83ec..2ab6b7ad089 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -36,13 +36,6 @@ ;; package which should always be present. -;;; Future notes: - -;; Once Emacs 19 becomes standard, many things in this package which are -;; messy for reasons of compatibility can be greatly simplified. For now, -;; I prefer to maintain one unified version. - - ;;; Change Log: ;; Version 2.02 (30 Jul 93): @@ -732,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 |