summaryrefslogtreecommitdiff
path: root/src/doc.c
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2012-11-30 18:27:41 +0100
committerJuanma Barranquero <lekktu@gmail.com>2012-11-30 18:27:41 +0100
commitf8aff4c6b87598697d7fc67063037ac69f1c9421 (patch)
tree608b6c3f8e8fc72203eaec7bfa9e08636b120829 /src/doc.c
parentfb3bf6ced41eea1431954e97137f52850a3b395c (diff)
downloademacs-f8aff4c6b87598697d7fc67063037ac69f1c9421.tar.gz
emacs-f8aff4c6b87598697d7fc67063037ac69f1c9421.tar.bz2
emacs-f8aff4c6b87598697d7fc67063037ac69f1c9421.zip
src/doc.c: Fix bug#13034.
(Fdocumentation): Re-add handling of function-documentation, accidentally removed in 2012-11-09T04:10:16Z!monnier@iro.umontreal.ca.
Diffstat (limited to 'src/doc.c')
-rw-r--r--src/doc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/doc.c b/src/doc.c
index 1d3d1e64442..76008295add 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -338,6 +338,14 @@ string is passed through `substitute-command-keys'. */)
doc = Qnil;
+ if (SYMBOLP (function))
+ {
+ Lisp_Object tem = Fget (function, Qfunction_documentation);
+ if (!NILP (tem))
+ return Fdocumentation_property (function, Qfunction_documentation,
+ raw);
+ }
+
fun = Findirect_function (function, Qnil);
if (CONSP (fun) && EQ (XCAR (fun), Qmacro))
fun = XCDR (fun);