# HG changeset patch # User Jim Blandy # Date 693163485 0 # Node ID ffdbf3445088686f0d2e4ba90c76912ff407d9ee # Parent 0ebc34e1b6ffd22af8e7bc5fb8b98f3c7e7f3ae6 *** empty log message *** diff -r 0ebc34e1b6ff -r ffdbf3445088 src/doc.c --- a/src/doc.c Thu Dec 19 05:21:52 1991 +0000 +++ b/src/doc.c Thu Dec 19 17:24:45 1991 +0000 @@ -48,13 +48,13 @@ register int count; extern char *index (); - if (XTYPE (Vexec_directory) != Lisp_String + if (XTYPE (Vdata_directory) != Lisp_String || XTYPE (Vdoc_file_name) != Lisp_String) return Qnil; - name = (char *) alloca (XSTRING (Vexec_directory)->size + name = (char *) alloca (XSTRING (Vdata_directory)->size + XSTRING (Vdoc_file_name)->size + 8); - strcpy (name, XSTRING (Vexec_directory)->data); + strcpy (name, XSTRING (Vdata_directory)->data); strcat (name, XSTRING (Vdoc_file_name)->data); #ifdef VMS #ifndef VMS4_4 @@ -175,7 +175,7 @@ Sdocumentation_property, 2, 2, 0, "Return the documentation string that is SYMBOL's PROP property.\n\ This differs from using `get' only in that it can refer to strings\n\ -stored in the `etc/DOC' file.") +stored in the `share-lib/DOC' file.") (sym, prop) Lisp_Object sym, prop; { @@ -192,10 +192,10 @@ DEFUN ("Snarf-documentation", Fsnarf_documentation, Ssnarf_documentation, 1, 1, 0, "Used during Emacs initialization, before dumping runnable Emacs,\n\ -to find pointers to doc strings stored in `etc/DOC...' and\n\ +to find pointers to doc strings stored in `share-lib/DOC...' and\n\ record them in function definitions.\n\ One arg, FILENAME, a string which does not include a directory.\n\ -The file is found in `../etc' now; found in the `exec-directory'\n\ +The file is found in `../share-lib' now; found in the `data-directory'\n\ when doc strings are referred to later in the dumped Emacs.") (filename) Lisp_Object filename; @@ -212,13 +212,13 @@ CHECK_STRING (filename, 0); #ifndef CANNOT_DUMP - name = (char *) alloca (XSTRING (filename)->size + 8); - strcpy (name, "../etc/"); + name = (char *) alloca (XSTRING (filename)->size + 14); + strcpy (name, "../share-lib/"); #else /* CANNOT_DUMP */ - CHECK_STRING (Vexec_directory, 0); + CHECK_STRING (Vdata_directory, 0); name = (char *) alloca (XSTRING (filename)->size + - XSTRING (Vexec_directory)->size + 1); - strcpy (name, XSTRING (Vexec_directory)->data); + XSTRING (Vdata_directory)->size + 1); + strcpy (name, XSTRING (Vdata_directory)->data); #endif /* CANNOT_DUMP */ strcat (name, XSTRING (filename)->data); /*** Add this line ***/ #ifdef VMS diff -r 0ebc34e1b6ff -r ffdbf3445088 src/lread.c --- a/src/lread.c Thu Dec 19 05:21:52 1991 +0000 +++ b/src/lread.c Thu Dec 19 17:24:45 1991 +0000 @@ -858,7 +858,7 @@ /* If purifying, and string starts with \ newline, return zero instead. This is for doc strings - that we are really going to find in etc/DOC.nn.nn */ + that we are really going to find in share-lib/DOC.nn.nn */ if (!NULL (Vpurify_flag) && NULL (Vdoc_file_name) && cancel) return make_number (0);