(apropos-command): Report documentation errors, rather than ignoring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3773c1664c3d5a2578ea6fcca2a029f871c32f0..d0b4024f2205f67ad47e298f943a769abcb44193 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,6 @@
 2008-08-30  Glenn Morris  <rgm@gnu.org>
 
-       * apropos.el (apropos-command): Ignore documentation errors.
+       * apropos.el (apropos-command): Report documentation errors.
        * help-fns.el (describe-function-1): Handle broken aliases.  (Bug#825)
 
 2008-08-29  Chong Yidong  <cyd@stupidchicken.com>

diff --git a/lisp/apropos.el b/lisp/apropos.el
index a0ac773cd2396a8cb6a289ef730ff7bc96d8d75a..31eada954fee29051c986c458d0435bc13850d06 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -489,8 +489,12 @@ while a list of strings is used as a word list."
                   (setq score (apropos-score-symbol symbol))
                   (unless var-predicate
                     (if (fboundp symbol)
-                        (if (setq doc (ignore-errors (documentation symbol t)))
-                            (progn
+                        (if (setq doc (condition-case nil
+                                           (documentation symbol t)
+                                         (error 'error)))
+                             ;; Eg alias to undefined function.
+                             (if (eq doc 'error)
+                                 "(documentation error)"
                               (setq score (+ score (apropos-score-doc doc)))
                               (substring doc 0 (string-match "\n" doc)))
                           "(not documented)")))