2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4363b03818..22868b19c03 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Richard Stallman  <rms@gnu.org>
+
+        * help-fns.el (describe-function-1): Don't use the advice origname
+        if it has no function definition.
+
 2007-10-18  Johan Bockg,Ae(Brd  <bojohan@gnu.org>
 
         * net/tramp.el (tramp-rfn-eshadow-update-overlay): Save excursion.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 3443cc634e0..f62fadc22b5 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -259,7 +259,7 @@ face (according to `face-differs-from-default-p')."
                    (cdr (assq 'origname advised))
                    (fboundp (cdr (assq 'origname advised)))
                    (cdr (assq 'origname advised)))
-            function))
+              function))
          ;; Get the real definition.
          (def (if (symbolp real-function)
                   (symbol-function real-function)