mairix.el fix for bug#13294

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

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 7dc7eebb06186dbfbe20ff3d3afca43961b510e6..b552d8c1357049def701712a7fe79ee3a07ac31a 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -494,8 +494,7 @@ suitable file is found, return nil."
          (use (car obsolete)))
     (when obsolete
       (insert "\nThis "
-             (if (eq (car-safe (symbol-function 'with-current-buffer))
-                     'macro)
+             (if (eq (car-safe (symbol-function function)) 'macro)
                  "macro"
                "function")
              " is obsolete")
@@ -616,13 +615,11 @@ FILE is the file where FUNCTION was probably defined."
                                  (point)))
       (terpri)(terpri)
 
-      (let* ((doc-raw (condition-case err
-                         (documentation function t)
-                       (error (format "No Doc! %S" err))))
+      (let* ((doc-raw (documentation function t))
             ;; If the function is autoloaded, and its docstring has
             ;; key substitution constructs, load the library.
             (doc (progn
-                   (and (autoloadp real-def)
+                   (and (autoloadp real-def) doc-raw
                         help-enable-auto-load
                         (string-match "\\([^\\]=\\|[^=]\\|\\`\\)\\\\[[{<]"
                                       doc-raw)
@@ -850,12 +847,10 @@ it is displayed along with the global value."
                    (obsolete (get variable 'byte-obsolete-variable))
                   (use (car obsolete))
                   (safe-var (get variable 'safe-local-variable))
-                   (doc (condition-case err
-                            (or (documentation-property
-                                 variable 'variable-documentation)
-                                (documentation-property
-                                 alias 'variable-documentation))
-                          (error (format "Doc not found: %S" err))))
+                   (doc (or (documentation-property
+                             variable 'variable-documentation)
+                            (documentation-property
+                             alias 'variable-documentation)))
                    (extra-line nil))
 
              ;; Mention if it's a local variable.