diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-12 16:11:50 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-12 16:11:50 -0400 |
| commit | 06485aa8215af39f9f5f999933aa39d349a2bdf9 (patch) | |
| tree | 7969cb614e87d05d5d603c52bff9534e2a5ca415 /src | |
| parent | bd0ffffd5a90e25d32708dd4fec29578648e1fad (diff) | |
| download | emacs-06485aa8215af39f9f5f999933aa39d349a2bdf9.tar.gz | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/doc.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d6429501059..d753221b996 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +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. diff --git a/src/doc.c b/src/doc.c index d2d664df266..9ead1addfba 100644 --- a/src/doc.c +++ b/src/doc.c @@ -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. */ |