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.  */