Commit 06485aa8 authored by Stefan Monnier's avatar Stefan Monnier

* 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.
parent bd0ffffd
2012-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* 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 <rgm@gnu.org>
......
......@@ -615,9 +615,7 @@ 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
......@@ -849,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.
......
......@@ -505,14 +505,12 @@ that."
((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)))))))
......
2012-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* doc.c (get_doc_string): Don't signal an error if the file is missing.
2012-10-12 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (hold_event_q): New static variable.
......
......@@ -144,7 +144,8 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool definition)
}
#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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment