diff options
author | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
commit | 18cd1f1a08833b0baad21c1d7b13a6845d95cf57 (patch) | |
tree | 03f33df7513d15bd5de0348aec35ef82bd061508 /lisp/emacs-lisp/advice.el | |
parent | 74863e7a78b1c8da1094a8250660a009c3b23015 (diff) | |
parent | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (diff) | |
download | emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.gz emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.bz2 emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.zip |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
Diffstat (limited to 'lisp/emacs-lisp/advice.el')
-rw-r--r-- | lisp/emacs-lisp/advice.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 4a5c9149a43..21136721e60 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -3004,8 +3004,10 @@ in any of these classes." (if advice-docstring (push advice-docstring paragraphs)))) (setq origdoc (if paragraphs - ;; separate paragraphs with blank lines: - (mapconcat 'identity (nreverse paragraphs) "\n\n"))) + (propertize + ;; separate paragraphs with blank lines: + (mapconcat 'identity (nreverse paragraphs) "\n\n") + 'ad-advice-info function))) (help-add-fundoc-usage origdoc usage))) (defun ad-make-plain-docstring (function) |