(Fdocumentation): Check for advice in all cases.

2 files changed, 16 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dda5d8e396d..915e31f7c87 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * doc.c (Fdocumentation): Check for advice in all cases.
+
 2007-10-19  Chong Yidong  <cyd@stupidchicken.com>
 
         * Makefile.in [HAVE_LIBRESOLV]: Add -lresolv to linker flags.
diff --git a/src/doc.c b/src/doc.c
index 53f645c6e53..ec02449035a 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -434,18 +434,6 @@ string is passed through `substitute-command-keys'.  */)
             doc = tem;
           else
             return Qnil;
-
-          /* Check for an advised function.  Its doc string
-             has an `ad-advice-info' text property.  */
-          if (STRINGP (doc))
-            {
-              Lisp_Object innerfunc;
-              innerfunc = Fget_text_property (make_number (0),
-                                              intern ("ad-advice-info"),
-                                              doc);
-              if (! NILP (innerfunc))
-                doc = call1 (intern ("ad-make-advised-docstring"), innerfunc);
-            }
         }
       else if (EQ (funcar, Qmacro))
         return Fdocumentation (Fcdr (fun), raw);
@@ -458,6 +446,18 @@ string is passed through `substitute-command-keys'.  */)
       xsignal1 (Qinvalid_function, fun);
     }
 
+  /* Check for an advised function.  Its doc string
+     has an `ad-advice-info' text property.  */
+  if (STRINGP (doc))
+    {
+      Lisp_Object innerfunc;
+      innerfunc = Fget_text_property (make_number (0),
+                                      intern ("ad-advice-info"),
+                                      doc);
+      if (! NILP (innerfunc))
+        doc = call1 (intern ("ad-make-advised-docstring"), innerfunc);
+    }
+
   /* If DOC is 0, it's typically because of a dumped file missing
      from the DOC file (bug in src/Makefile.in).  */
   if (EQ (doc, make_number (0)))