(Fexpand_file_name) [VMS]:

Use NO_HYPHENS_IN_FILENAMES, not VMS4_4.

diff --git a/src/ChangeLog b/src/ChangeLog
index 56f07d13b374364933c8ebe5839ab9490281f955..b275ab3db7abe6537e6184c92e185d9fbc6ae124 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2005-03-03  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * s/vms.h (FILE_SYSTEM_CASE): New macro.

diff --git a/src/fileio.c b/src/fileio.c
index cd4328b3f96daca1aaedc7c97cd920a20e47816e..7b9b5c446eb66b798db526a5291140c9f9aa76ac 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1198,23 +1198,23 @@ See also the function `substitute-in-file-name'.")
            slash = p;
          }
          if (p[0] == '-')
-#ifndef VMS4_4
-           /* VMS pre V4.4,convert '-'s in filenames. */
+#ifdef NO_HYPHENS_IN_FILENAMES
            if (lbrack == rbrack)
              {
-               if (dots < 2)   /* this is to allow negative version numbers */
+                /* Avoid clobbering negative version numbers.  */
+               if (dots < 2)
                  p[0] = '_';
              }
            else
-#endif /* VMS4_4 */
+#endif /* NO_HYPHENS_IN_FILENAMES */
              if (lbrack > rbrack &&
                  ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') &&
                   (p[1] == '.' || p[1] == ']' || p[1] == '>')))
                lose = 1;
-#ifndef VMS4_4
+#ifdef NO_HYPHENS_IN_FILENAMES
              else
                p[0] = '_';
-#endif /* VMS4_4 */
+#endif /* NO_HYPHENS_IN_FILENAMES */
          /* count open brackets, reset close bracket pointer */
          if (p[0] == '[' || p[0] == '<')
            lbrack++, brack = 0;
@@ -1585,12 +1585,12 @@ See also the function `substitute-in-file-name'.")
        }
       else
        {
-#ifndef VMS4_4
+#ifdef NO_HYPHENS_IN_FILENAMES
          if (*p == '-' &&
              o[-1] != '[' && o[-1] != '<' && o[-1] != '.' &&
              p[1] != ']' && p[1] != '>' && p[1] != '.')
            *p = '_';
-#endif /* VMS4_4 */
+#endif /* NO_HYPHENS_IN_FILENAMES */
          *o++ = *p++;
        }
 #else /* not VMS */