diff options
| author | Miles Bader <miles@gnu.org> | 2005-03-09 00:09:34 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-03-09 00:09:34 +0000 |
| commit | 2cdd4f8845ab5519a15f3c603d9ab48f7e1a91bd (patch) | |
| tree | 61823da8e4c3589c2c30ffaea3353cb92def7b1f /src/doc.c | |
| parent | bcd98ae6b3b5ed8f38618b3a52acdbcd944c8095 (diff) | |
| parent | ec3c4a4cf2b336d2ca507e30877115a3e37e4df4 (diff) | |
| download | emacs-2cdd4f8845ab5519a15f3c603d9ab48f7e1a91bd.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-23
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0 (patch 150-165)
- Update from CVS
- Merge from gnus--rel--5.10
- Add info/dir to arch branch
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 34-37)
- Merge from emacs--cvs-trunk--0
- Update from CVS
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/src/doc.c b/src/doc.c index e1012b97198..b4ae05ca6c4 100644 --- a/src/doc.c +++ b/src/doc.c @@ -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)) |