[Emacs-diffs] Changes to emacs/lisp/help-fns.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/10/19 01:12:44

Index: help-fns.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- help-fns.el 15 Oct 2007 14:20:38 -0000      1.105
+++ help-fns.el 19 Oct 2007 01:12:43 -0000      1.106
@@ -252,10 +252,13 @@
 ;;;###autoload
 (defun describe-function-1 (function)
   (let* ((advised (and (featurep 'advice) (ad-get-advice-info function)))
-        ;; If the function is advised, get the symbol that has the
-        ;; real definition.
+        ;; If the function is advised, use the symbol that has the
+        ;; real definition, if that symbol is already set up.
         (real-function
-         (if advised (cdr (assq 'origname advised))
+         (or (and advised
+                  (cdr (assq 'origname advised))
+                  (fboundp (cdr (assq 'origname advised)))
+                  (cdr (assq 'origname advised)))
            function))
         ;; Get the real definition.
         (def (if (symbolp real-function)