Merge from emacs--devo--0

[gnu-emacs] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index f491661a61658a5b9cf833f3155cf4c02d1fde11..c4af523baac12b62f764884d5552fce41fd30d24 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -434,6 +434,18 @@ 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);