Commit 01b5eb3e authored by Stefan Monnier's avatar Stefan Monnier

Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs into trunk

parents baee135c 4b83e7d0
......@@ -436,8 +436,20 @@ aren't strings. */)
documentation_property:
tem = Fget (symbol, prop);
/* If we don't have any documentation for this symbol, try to see whether
it's an indirect variable and get the documentation from there instead. */
if (NILP (tem))
{
Lisp_Object indirect = Findirect_variable (symbol);
if (!NILP (indirect))
tem = Fget (indirect, prop);
}
if (EQ (tem, make_fixnum (0)))
tem = Qnil;
/* See if we want to look for the string in the DOC file. */
if (FIXNUMP (tem) || (CONSP (tem) && FIXNUMP (XCDR (tem))))
{
Lisp_Object doc = tem;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment