summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-lib.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-10-11 16:36:23 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-10-11 16:36:23 -0400
commit9f1a4aa5053253b83b776ff52ed332b5efbae2ca (patch)
tree0a28753fb5ec4c71cc6f95b5385433dd8f1ff4e1 /lisp/emacs-lisp/cl-lib.el
parent389a94a53dfc947c5dc9964b5617e0098513bbe0 (diff)
downloademacs-9f1a4aa5053253b83b776ff52ed332b5efbae2ca.tar.gz
* lisp/emacs-lisp/cl-lib.el (cl--defsubst-expand): Undo last change.
* lisp/emacs-lisp/cl-macs.el (cl--defsubst-expand): Idem.
Diffstat (limited to 'lisp/emacs-lisp/cl-lib.el')
-rw-r--r--lisp/emacs-lisp/cl-lib.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 802d25b097a..122402797e1 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -727,6 +727,10 @@ If ALIST is non-nil, the new pairs are prepended to it."
;;;###autoload
(progn
+ ;; Make sure functions defined with cl-defsubst can be inlined even in
+ ;; packages which do not require CL. We don't put an autoload cookie
+ ;; directly on that function, since those cookies only go to cl-loaddefs.
+ (autoload 'cl--defsubst-expand "cl-macs")
;; Autoload, so autoload.el and font-lock can use it even when CL
;; is not loaded.
(put 'cl-defun 'doc-string-elt 3)