summaryrefslogtreecommitdiff
path: root/lisp/help-mode.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2012-06-27 17:16:32 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2012-06-27 17:16:32 -0400
commit04901786943c00a9d2077d39ecbd2ac5c6f54b5f (patch)
tree2cf103d5688aafe2f2eda9d90d6641d508867d5c /lisp/help-mode.el
parent1ec4b7b25979ff9ea72a3ea35bf35d5882f467f7 (diff)
downloademacs-04901786943c00a9d2077d39ecbd2ac5c6f54b5f.tar.gz
* lisp/help-mode.el (help-make-xrefs): Don't just withstand
cyclic-variable-indirection but any error in documentation-property.
Diffstat (limited to 'lisp/help-mode.el')
-rw-r--r--lisp/help-mode.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 85c1e62e2c3..fa7d9b325db 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -500,14 +500,14 @@ that."
((and
(or (boundp sym)
(get sym 'variable-documentation))
- (or
- (documentation-property
- sym 'variable-documentation)
- (condition-case nil
+ (condition-case err
+ (or
+ (documentation-property
+ sym 'variable-documentation)
(documentation-property
(indirect-variable sym)
- 'variable-documentation)
- (cyclic-variable-indirection nil))))
+ 'variable-documentation))
+ (error (message "No doc found: %S" err) nil)))
(help-xref-button 8 'help-variable sym))
((fboundp sym)
(help-xref-button 8 'help-function sym)))))))