summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJesper Harder <harder@ifa.au.dk>2004-04-05 12:09:53 +0000
committerJesper Harder <harder@ifa.au.dk>2004-04-05 12:09:53 +0000
commit1d0a6ebb506eeb7151ab598fec4f73f709238e41 (patch)
tree1c77c93686ca786db83968fd2177d198173fefe4 /lisp
parentcbfbd37df53da11856400772164840d1162b2959 (diff)
downloademacs-1d0a6ebb506eeb7151ab598fec4f73f709238e41.tar.gz
emacs-1d0a6ebb506eeb7151ab598fec4f73f709238e41.tar.bz2
emacs-1d0a6ebb506eeb7151ab598fec4f73f709238e41.zip
(help-make-xrefs): Recognize aliased variable with
inherited docstring.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/help-mode.el10
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f8b71b739d..e6c9d8d37a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2004-04-05 Jesper Harder <harder@ifa.au.dk>
+ * help-mode.el (help-make-xrefs): Recognize aliased variable with
+ inherited docstring.
+
* play/gamegrid.el (gamegrid-add-score-insecure): Use sort-fields.
2004-04-04 Luc Teirlinck <teirllm@auburn.edu>
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 032509b9614..a2a121a89e9 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -374,8 +374,14 @@ that."
(help-xref-button 8 'help-symbol sym))
((and
(boundp sym)
- (documentation-property sym
- 'variable-documentation))
+ (or
+ (documentation-property
+ sym 'variable-documentation)
+ (condition-case nil
+ (documentation-property
+ (indirect-variable sym)
+ 'variable-documentation)
+ (cyclic-variable-indirection nil))))
(help-xref-button 8 'help-variable sym))
((fboundp sym)
(help-xref-button 8 'help-function sym)))))))