Merge from emacs--devo--0

[gnu-emacs] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index 4cd43f0ae90662289293e2f2a26ee97625692b01..f491661a61658a5b9cf833f3155cf4c02d1fde11 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -41,7 +41,7 @@ Boston, MA 02110-1301, USA.  */
 #include "lisp.h"
 #include "buffer.h"
 #include "keyboard.h"
-#include "charset.h"
+#include "character.h"
 #include "keymap.h"
 
 #ifdef HAVE_INDEX
@@ -617,8 +617,10 @@ the same file name is found in the `doc-directory'.  */)
     int nr_read;
     char *cp = NULL;
     char *beg, *end;
+    Lisp_Object buildobj = Fexpand_file_name (build_string ("buildobj.lst"),
+                                             Vdoc_directory);
 
-    fd = emacs_open ("buildobj.lst", O_RDONLY, 0);
+    fd = emacs_open (SDATA (buildobj), O_RDONLY, 0);
     if (fd < 0)
       report_file_error ("Opening file buildobj.lst", Qnil);