Undo change in xdisp.c in 2012-06-29T11:48:08Z!dmantipov@yandex.ru.

[gnu-emacs] / lisp / help-mode.el

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 85c1e62e2c353694c93622565ef8951b2f91bab9..fa7d9b325dbe16075e1f69886e2a26b9ca765eac 100644 (file)
--- 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)))))))