Commit 64eb0083 authored by Thien-Thi Nguyen's avatar Thien-Thi Nguyen
Browse files

(munge_doc_file_name) [VMS]: Use NO_HYPHENS_IN_FILENAMES, not VMS4_4.

(Fsnarf_documentation): Call munge_doc_file_name.
parent ad204e95
2005-03-04 Thien-Thi Nguyen <ttn@gnu.org>
* s/vms.h: Define NO_HYPHENS_IN_FILENAMES.
* s/vms4-4.h, s/vms5-5.h: Undefine NO_HYPHENS_IN_FILENAMES.
* fileio.c (Fexpand_file_name) [VMS]:
Use NO_HYPHENS_IN_FILENAMES, not VMS4_4.
* doc.c (munge_doc_file_name) [VMS]: Likewise.
(Fsnarf_documentation): Call munge_doc_file_name.
2005-03-04 Thien-Thi Nguyen <ttn@gnu.org> 2005-03-04 Thien-Thi Nguyen <ttn@gnu.org>
   
* s/vms.h (FILE_SYSTEM_CASE): New macro. * s/vms.h (FILE_SYSTEM_CASE): New macro.
......
...@@ -58,26 +58,24 @@ static Lisp_Object Vbuild_files; ...@@ -58,26 +58,24 @@ static Lisp_Object Vbuild_files;
extern Lisp_Object Voverriding_local_map; extern Lisp_Object Voverriding_local_map;
/* For VMS versions with limited file name syntax, /* For VMS versions with limited file name syntax,
convert the name to something VMS will allow. */ convert the name to something VMS will allow. */
static void static void
munge_doc_file_name (name) munge_doc_file_name (name)
char *name; char *name;
{ {
#ifdef VMS #ifdef VMS
#ifndef VMS4_4 #ifndef NO_HYPHENS_IN_FILENAMES
/* For VMS versions with limited file name syntax, extern char * sys_translate_unix (char *ufile);
convert the name to something VMS will allow. */ strcpy (name, sys_translate_unix (name));
p = name; #else /* NO_HYPHENS_IN_FILENAMES */
char *p = name;
while (*p) while (*p)
{ {
if (*p == '-') if (*p == '-')
*p = '_'; *p = '_';
p++; p++;
} }
#endif /* not VMS4_4 */ #endif /* NO_HYPHENS_IN_FILENAMES */
#ifdef VMS4_4
strcpy (name, sys_translate_unix (name));
#endif /* VMS4_4 */
#endif /* VMS */ #endif /* VMS */
} }
...@@ -607,21 +605,7 @@ the same file name is found in the `doc-directory'. */) ...@@ -607,21 +605,7 @@ the same file name is found in the `doc-directory'. */)
strcpy (name, SDATA (Vdoc_directory)); strcpy (name, SDATA (Vdoc_directory));
} }
strcat (name, SDATA (filename)); /*** Add this line ***/ strcat (name, SDATA (filename)); /*** Add this line ***/
#ifdef VMS munge_doc_file_name (name);
#ifndef VMS4_4
/* For VMS versions with limited file name syntax,
convert the name to something VMS will allow. */
p = name;
while (*p)
{
if (*p == '-')
*p = '_';
p++;
}
#else /* VMS4_4 */
strcpy (name, sys_translate_unix (name));
#endif /* VMS4_4 */
#endif /* VMS */
/* Vbuild_files is nil when temacs is run, and non-nil after that. */ /* Vbuild_files is nil when temacs is run, and non-nil after that. */
if (NILP (Vbuild_files)) if (NILP (Vbuild_files))
......
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