procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/doc.c: Fix bug#13034.

Browse source 
(Fdocumentation): Re-add handling of function-documentation,
accidentally removed in 2012-11-09T04:10:16Z!monnier@iro.umontreal.ca.
This commit is contained in:
Juanma Barranquero 2012-11-30 18:27:41 +01:00
parent fb3bf6ced4
commit f8aff4c6b8
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-11-30 Juanma Barranquero <lekktu@gmail.com>
* doc.c (Fdocumentation): Re-add handling of function-documentation,
accidentally removed in 2012-11-09T04:10:16Z!monnier@iro.umontreal.ca (bug#13034).
2012-11-29 Dmitry Antipov <dmantipov@yandex.ru>
* xdisp.c (window_outdated): Remove eassert since it hits

8
src/doc.c
View file

@ -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);