[Emacs-diffs] Changes to emacs/lisp/apropos.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/08/30 20:14:01

Index: apropos.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/apropos.el,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- apropos.el  30 Aug 2008 03:25:50 -0000      1.132
+++ apropos.el  30 Aug 2008 20:14:01 -0000      1.133
@@ -489,8 +489,12 @@
                   (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)")))