[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108775: * lisp/help-mode.el (help-make-xrefs): Don't just withstand

[Stefan Monnier]

------------------------------------------------------------
revno: 108775
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-27 17:16:32 -0400
message:
  * lisp/help-mode.el (help-make-xrefs): Don't just withstand
  cyclic-variable-indirection but any error in documentation-property.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl.el
  lisp/help-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-27 21:15:13 +0000
+++ b/lisp/ChangeLog    2012-06-27 21:16:32 +0000
@@ -1,5 +1,8 @@
 2012-06-27  Stefan Monnier  <address@hidden>
 
+       * help-mode.el (help-make-xrefs): Don't just withstand
+       cyclic-variable-indirection but any error in documentation-property.
+
        * loadup.el (purify-flag): Pre-grow the hash-table to reduce the
        memory use.
        * bindings.el (bindings--define-key): New function.

=== modified file 'lisp/emacs-lisp/cl.el'
--- a/lisp/emacs-lisp/cl.el     2012-06-27 15:11:28 +0000
+++ b/lisp/emacs-lisp/cl.el     2012-06-27 21:16:32 +0000
@@ -519,7 +519,7 @@
 
 ;; Generalized variables are provided by gv.el, but some details are
 ;; not 100% compatible: not worth the trouble to add them to cl-lib.el, but we
-;; still to support old users of cl.el.
+;; still need to support old users of cl.el.
 
 ;; FIXME: `letf' is unsatisfactory because it does not really "restore" the
 ;; previous state.  If the getter/setter loses information, that info is

=== modified file 'lisp/help-mode.el'
--- a/lisp/help-mode.el 2012-06-13 12:36:29 +0000
+++ b/lisp/help-mode.el 2012-06-27 21:16:32 +0000
@@ -500,14 +500,14 @@
                            ((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)))))))