aboutsummaryrefslogtreecommitdiffstats
path: root/src/doc.c
diff options
context:
space:
mode:
authorChong Yidong2014-01-03 13:37:58 +0800
committerChong Yidong2014-01-03 13:37:58 +0800
commit0d53f628be877abf2da4693df620d91d474ec058 (patch)
tree338b0147ef2192cb087849636437d287ea032012 /src/doc.c
parent6ef9aed822746c3daf05313bbc0df7dfa9f08171 (diff)
downloademacs-0d53f628be877abf2da4693df620d91d474ec058.tar.gz
emacs-0d53f628be877abf2da4693df620d91d474ec058.zip
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.c15
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'. */)
416 xsignal1 (Qinvalid_function, fun); 416 xsignal1 (Qinvalid_function, fun);
417 } 417 }
418 418
419 /* Check for a dynamic docstring. These come with
420 a dynamic-docstring-function text property. */
421 if (STRINGP (doc))
422 {
423 Lisp_Object func
424 = Fget_text_property (make_number (0),
425 intern ("dynamic-docstring-function"),
426 doc);
427 if (!NILP (func))
428 /* Pass both `doc' and `function' since `function' can be needed, and
429 finding `doc' can be annoying: calling `documentation' is not an
430 option because it would infloop. */
431 doc = call2 (func, doc, function);
432 }
433
434 /* If DOC is 0, it's typically because of a dumped file missing 419 /* If DOC is 0, it's typically because of a dumped file missing
435 from the DOC file (bug in src/Makefile.in). */ 420 from the DOC file (bug in src/Makefile.in). */
436 if (EQ (doc, make_number (0))) 421 if (EQ (doc, make_number (0)))