Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 899-900)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 129-130)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 259-260)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-272

1 files changed, 12 insertions, 0 deletions

diff --git a/src/doc.c b/src/doc.c
index f491661a616..c4af523baac 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);