diff options
author | Kenichi Handa <handa@gnu.org> | 2012-10-14 17:06:11 +0900 |
---|---|---|
committer | Kenichi Handa <handa@gnu.org> | 2012-10-14 17:06:11 +0900 |
commit | 9fe32d61c5655878f877522ac4bcc251d092f732 (patch) | |
tree | 584f4c85fd2e44e8e7d597382f177359b737acb1 /lisp/emacs-lisp/cl-lib.el | |
parent | f5772b8eaee90d0b50a60bd55d9d28805a2543cb (diff) | |
parent | 8111f5e6f05228e36496f3bdccad711f569acb9b (diff) | |
download | emacs-9fe32d61c5655878f877522ac4bcc251d092f732.tar.gz emacs-9fe32d61c5655878f877522ac4bcc251d092f732.tar.bz2 emacs-9fe32d61c5655878f877522ac4bcc251d092f732.zip |
merge trunk
Diffstat (limited to 'lisp/emacs-lisp/cl-lib.el')
-rw-r--r-- | lisp/emacs-lisp/cl-lib.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el index 2eda628e262..122402797e1 100644 --- a/lisp/emacs-lisp/cl-lib.el +++ b/lisp/emacs-lisp/cl-lib.el @@ -728,7 +728,8 @@ 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. + ;; 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. |