1 files changed, 12 insertions, 0 deletions
diff --git a/src/doc.c b/src/doc.c
index 4cd43f0ae9..53f645c6e5 100644
--- 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);