4 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d9c85c1326..97e9965c6b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 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 2eda628e262..802d25b097a 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -727,9 +727,6 @@ 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.
-  (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 592c33d21c5..1a701e9047a 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2595,6 +2595,9 @@ 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))
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index ef482f8f0e9..f17b29de720 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -621,7 +621,7 @@ FILE is the file where FUNCTION was probably defined."
              ;; If the function is autoloaded, and its docstring has
              ;; key substitution constructs, load the library.
              (doc (progn
-                    (and (autoloadp real-def)
+                    (and (autoloadp real-def) doc-raw
                          help-enable-auto-load
                          (string-match "\\([^\\]=\\|[^=]\\|\\`\\)\\\\[[{<]"
                                        doc-raw)