* lisp/emacs-lisp/cl-lib.el (cl--defsubst-expand): Undo last change.

* lisp/emacs-lisp/cl-macs.el (cl--defsubst-expand): Idem.

3 files changed, 4 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97e9965c6b9..534d0ad2dcd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,6 @@
 2012-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * help-fns.el (describe-function-1): Handle autoloads w/o docstrings.
-        * emacs-lisp/cl-lib.el (cl--defsubst-expand): Move autoload...
-        * emacs-lisp/cl-macs.el (cl--defsubst-expand): ...here.
 
         * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
         changes to the format of load-history.
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)
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 1a701e9047a..592c33d21c5 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2595,9 +2595,6 @@ surrounded by (cl-block NAME ...).
               ,(and (memq '&key args) 'cl-whole) ,unsafe ,@argns)))
        (cl-defun ,name ,args ,@body))))
 
-;; Make sure functions defined with cl-defsubst can be inlined even in
-;; packages which do not require CL.
-;;;###autoload
 (defun cl--defsubst-expand (argns body simple whole unsafe &rest argvs)
   (if (and whole (not (cl--safe-expr-p (cons 'progn argvs)))) whole
     (if (cl--simple-exprs-p argvs) (setq simple t))