diff options
| author | Chong Yidong <cyd@gnu.org> | 2014-01-03 13:37:58 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2014-01-03 13:37:58 +0800 |
| commit | 0d53f628be877abf2da4693df620d91d474ec058 (patch) | |
| tree | 338b0147ef2192cb087849636437d287ea032012 /src/doc.c | |
| parent | 6ef9aed822746c3daf05313bbc0df7dfa9f08171 (diff) | |
| download | emacs-0d53f628be877abf2da4693df620d91d474ec058.tar.gz | |
Remove the dynamic-docstring-function feature.
* emacs-lisp/advice.el (ad--make-advised-docstring): Change args.
Ignore function-documentation property when getting documentation.
(ad-activate-advised-definition): Use function-documentation
generate the docstring.
(ad-make-advised-definition): Don't call
ad-make-advised-definition-docstring.
(ad-make-advised-definition-docstring, ad-advised-definition-p):
Delete functions.
* emacs-lisp/nadvice.el (advice--make-docstring): Change args.
(advice--docstring): Delete variable.
(advice--make-1): Leave the docstring empty.
(advice-add): Use function-documentation for advised docstring.
* progmodes/sql.el (sql-help): Use function-documentation instead
of dynamic-docstring-function property. No need to autoload now.
(sql--help-docstring): New variable.
(sql--make-help-docstring): Use it.
* doc.c (Fdocumentation): Remove dynamic-docstring-function.
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/doc.c b/src/doc.c index 0d9c8021cdf..ecefd776b85 100644 --- a/src/doc.c +++ b/src/doc.c @@ -416,21 +416,6 @@ string is passed through `substitute-command-keys'. */) xsignal1 (Qinvalid_function, fun); } - /* Check for a dynamic docstring. These come with - a dynamic-docstring-function text property. */ - if (STRINGP (doc)) - { - Lisp_Object func - = Fget_text_property (make_number (0), - intern ("dynamic-docstring-function"), - doc); - if (!NILP (func)) - /* Pass both `doc' and `function' since `function' can be needed, and - finding `doc' can be annoying: calling `documentation' is not an - option because it would infloop. */ - doc = call2 (func, doc, function); - } - /* If DOC is 0, it's typically because of a dumped file missing from the DOC file (bug in src/Makefile.in). */ if (EQ (doc, make_number (0))) |