[Emacs-diffs] /srv/bzr/emacs/trunk r110511: * lisp/help-fns.el (describe-function-1): Handle autoloads w/o docstrings.

[Stefan Monnier]

------------------------------------------------------------
revno: 110511
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-10-11 16:11:23 -0400
message:
  * lisp/help-fns.el (describe-function-1): Handle autoloads w/o docstrings.
  * lisp/emacs-lisp/cl-lib.el (cl--defsubst-expand): Move autoload...
  * lisp/emacs-lisp/cl-macs.el (cl--defsubst-expand): ...here.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-lib.el
  lisp/emacs-lisp/cl-macs.el
  lisp/help-fns.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-11 20:08:38 +0000
+++ b/lisp/ChangeLog    2012-10-11 20:11:23 +0000
@@ -1,5 +1,9 @@
 2012-10-11  Stefan Monnier  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/emacs-lisp/cl-lib.el'
--- a/lisp/emacs-lisp/cl-lib.el 2012-09-28 23:30:52 +0000
+++ b/lisp/emacs-lisp/cl-lib.el 2012-10-11 20:11:23 +0000
@@ -727,9 +727,6 @@
 
 ;;;###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)

=== modified file 'lisp/emacs-lisp/cl-macs.el'
--- a/lisp/emacs-lisp/cl-macs.el        2012-10-09 06:01:10 +0000
+++ b/lisp/emacs-lisp/cl-macs.el        2012-10-11 20:11:23 +0000
@@ -2595,6 +2595,9 @@
               ,(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))

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2012-09-30 08:24:56 +0000
+++ b/lisp/help-fns.el  2012-10-11 20:11:23 +0000
@@ -621,7 +621,7 @@
             ;; 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)