procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(Fsnarf_documentation): Call munge_doc_file_name.
This commit is contained in:
Thien-Thi Nguyen 2005-03-04 21:59:33 +00:00
parent ad204e956a
commit 64eb0083b1
2 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ChangeLog
View file

@ -1,3 +1,12 @@
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>
* s/vms.h (FILE_SYSTEM_CASE): New macro.

32
src/doc.c
View file

@ -58,26 +58,24 @@ static Lisp_Object Vbuild_files;
extern Lisp_Object Voverriding_local_map;
/* 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
munge_doc_file_name (name)
char *name;
{
#ifdef VMS
#ifndef VMS4_4
/* For VMS versions with limited file name syntax,
convert the name to something VMS will allow. */
p = name;
#ifndef NO_HYPHENS_IN_FILENAMES
extern char * sys_translate_unix (char *ufile);
strcpy (name, sys_translate_unix (name));
#else /* NO_HYPHENS_IN_FILENAMES */
char *p = name;
while (*p)
{
if (*p == '-')
*p = '_';
p++;
}
#endif /* not VMS4_4 */
#ifdef VMS4_4
strcpy (name, sys_translate_unix (name));
#endif /* VMS4_4 */
#endif /* NO_HYPHENS_IN_FILENAMES */
#endif /* VMS */
}
@ -607,21 +605,7 @@ the same file name is found in the `doc-directory'. */)
strcpy (name, SDATA (Vdoc_directory));
}
strcat (name, SDATA (filename)); /*** Add this line ***/
#ifdef VMS
#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 */
munge_doc_file_name (name);
/* Vbuild_files is nil when temacs is run, and non-nil after that. */
if (NILP (Vbuild_files))