diff options
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 24 |
1 files changed, 12 insertions, 12 deletions
| @@ -434,18 +434,6 @@ string is passed through `substitute-command-keys'. */) | |||
| 434 | doc = tem; | 434 | doc = tem; |
| 435 | else | 435 | else |
| 436 | return Qnil; | 436 | return Qnil; |
| 437 | |||
| 438 | /* Check for an advised function. Its doc string | ||
| 439 | has an `ad-advice-info' text property. */ | ||
| 440 | if (STRINGP (doc)) | ||
| 441 | { | ||
| 442 | Lisp_Object innerfunc; | ||
| 443 | innerfunc = Fget_text_property (make_number (0), | ||
| 444 | intern ("ad-advice-info"), | ||
| 445 | doc); | ||
| 446 | if (! NILP (innerfunc)) | ||
| 447 | doc = call1 (intern ("ad-make-advised-docstring"), innerfunc); | ||
| 448 | } | ||
| 449 | } | 437 | } |
| 450 | else if (EQ (funcar, Qmacro)) | 438 | else if (EQ (funcar, Qmacro)) |
| 451 | return Fdocumentation (Fcdr (fun), raw); | 439 | return Fdocumentation (Fcdr (fun), raw); |
| @@ -458,6 +446,18 @@ string is passed through `substitute-command-keys'. */) | |||
| 458 | xsignal1 (Qinvalid_function, fun); | 446 | xsignal1 (Qinvalid_function, fun); |
| 459 | } | 447 | } |
| 460 | 448 | ||
| 449 | /* Check for an advised function. Its doc string | ||
| 450 | has an `ad-advice-info' text property. */ | ||
| 451 | if (STRINGP (doc)) | ||
| 452 | { | ||
| 453 | Lisp_Object innerfunc; | ||
| 454 | innerfunc = Fget_text_property (make_number (0), | ||
| 455 | intern ("ad-advice-info"), | ||
| 456 | doc); | ||
| 457 | if (! NILP (innerfunc)) | ||
| 458 | doc = call1 (intern ("ad-make-advised-docstring"), innerfunc); | ||
| 459 | } | ||
| 460 | |||
| 461 | /* If DOC is 0, it's typically because of a dumped file missing | 461 | /* If DOC is 0, it's typically because of a dumped file missing |
| 462 | from the DOC file (bug in src/Makefile.in). */ | 462 | from the DOC file (bug in src/Makefile.in). */ |
| 463 | if (EQ (doc, make_number (0))) | 463 | if (EQ (doc, make_number (0))) |