[Emacs-diffs] /srv/bzr/emacs/trunk r110527: * src/doc.c (get_doc_string): Don't signal an error if the file is missing.

[Stefan Monnier]

------------------------------------------------------------
revno: 110527
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-12 16:11:50 -0400
message:
  * src/doc.c (get_doc_string): Don't signal an error if the file is missing.
  * lisp/help-fns.el (describe-variable, describe-function-1):
  * lisp/help-mode.el (help-make-xrefs): Remove error handler, made unneeded.
modified:
  lisp/ChangeLog
  lisp/help-fns.el
  lisp/help-mode.el
  src/ChangeLog
  src/doc.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-12 20:07:58 +0000
+++ b/lisp/ChangeLog    2012-10-12 20:11:50 +0000
@@ -1,5 +1,8 @@
 2012-10-12  Stefan Monnier  <address@hidden>
 
+       * help-fns.el (describe-variable, describe-function-1):
+       * help-mode.el (help-make-xrefs): Remove error handler, made unneeded.
+
        * emacs-lisp/eieio.el (lisp-imenu-generic-expression): Fix typo.
 
 2012-10-12  Glenn Morris  <address@hidden>

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2012-10-11 20:11:23 +0000
+++ b/lisp/help-fns.el  2012-10-12 20:11:50 +0000
@@ -615,9 +615,7 @@
                                  (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
@@ -849,12 +847,10 @@
                    (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.

=== modified file 'lisp/help-mode.el'
--- a/lisp/help-mode.el 2012-08-05 08:41:12 +0000
+++ b/lisp/help-mode.el 2012-10-12 20:11:50 +0000
@@ -505,14 +505,12 @@
                            ((and
                              (or (boundp sym)
                                  (get sym 'variable-documentation))
-                             (condition-case err
-                                 (or
-                                  (documentation-property
-                                   sym 'variable-documentation)
-                                  (documentation-property
-                                   (indirect-variable sym)
-                                   'variable-documentation))
-                               (error (message "No doc found: %S" err) nil)))
+                             (or
+                              (documentation-property
+                               sym 'variable-documentation)
+                              (documentation-property
+                               (indirect-variable sym)
+                               'variable-documentation)))
                             (help-xref-button 8 'help-variable sym))
                            ((fboundp sym)
                             (help-xref-button 8 'help-function sym)))))))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-12 17:50:39 +0000
+++ b/src/ChangeLog     2012-10-12 20:11:50 +0000
@@ -1,3 +1,7 @@
+2012-10-12  Stefan Monnier  <address@hidden>
+
+       * doc.c (get_doc_string): Don't signal an error if the file is missing.
+
 2012-10-12  Jan Djärv  <address@hidden>
 
        * nsterm.m (hold_event_q): New static variable.

=== modified file 'src/doc.c'
--- a/src/doc.c 2012-09-15 07:06:56 +0000
+++ b/src/doc.c 2012-10-12 20:11:50 +0000
@@ -144,7 +144,8 @@
        }
 #endif
       if (fd < 0)
-       error ("Cannot open doc string file \"%s\"", name);
+       return concat3 (build_string ("Cannot open doc string file \""),
+                       file, build_string ("\"\n"));
     }
 
   /* Seek only to beginning of disk block.  */