From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 19 Oct 2007 01:12:43 +0000 (+0000)
Subject: (describe-function-1): Don't use the advice origname
X-Git-Tag: emacs-pretest-23.0.90~10231
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd3f89d7176b52d7c1983ce8bd91bd1d3938fd77;p=emacs.git

(describe-function-1): Don't use the advice origname
if it has no function definition yet.
---

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index befd83c76ef..3443cc634e0 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -252,10 +252,13 @@ face (according to `face-differs-from-default-p')."
 ;;;###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)