[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 01b5eb3 2/2: Merge branch 'master' of git+ssh://git
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 01b5eb3 2/2: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs into trunk |
Date: |
Wed, 26 Jun 2019 10:27:42 -0400 (EDT) |
branch: master
commit 01b5eb3e735ab33dd2d5f1bf279e44d699c92c4f
Merge: baee135 4b83e7d
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs into trunk
---
src/doc.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/doc.c b/src/doc.c
index 3fa0eaa..bc05d09 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 01b5eb3 2/2: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs into trunk,
Stefan Monnier <=