emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/src/fileio.c


From: Thien-Thi Nguyen
Subject: [Emacs-diffs] Changes to emacs/src/fileio.c
Date: Fri, 04 Mar 2005 16:57:22 -0500

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.528 emacs/src/fileio.c:1.529
*** emacs/src/fileio.c:1.528    Fri Mar  4 17:13:23 2005
--- emacs/src/fileio.c  Fri Mar  4 21:57:21 2005
***************
*** 1222,1244 ****
            slash = p;
          }
          if (p[0] == '-')
! #ifndef VMS4_4
!           /* VMS pre V4.4,convert '-'s in filenames. */
            if (lbrack == rbrack)
              {
!               if (dots < 2)   /* this is to allow negative version numbers */
                  p[0] = '_';
              }
            else
! #endif /* VMS4_4 */
              if (lbrack > rbrack &&
                  ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') &&
                   (p[1] == '.' || p[1] == ']' || p[1] == '>')))
                lose = 1;
! #ifndef VMS4_4
              else
                p[0] = '_';
! #endif /* VMS4_4 */
          /* count open brackets, reset close bracket pointer */
          if (p[0] == '[' || p[0] == '<')
            lbrack++, brack = 0;
--- 1222,1244 ----
            slash = p;
          }
          if (p[0] == '-')
! #ifdef NO_HYPHENS_IN_FILENAMES
            if (lbrack == rbrack)
              {
!                 /* Avoid clobbering negative version numbers.  */
!                 if (dots < 2)
                  p[0] = '_';
              }
            else
! #endif /* NO_HYPHENS_IN_FILENAMES */
              if (lbrack > rbrack &&
                  ((p[-1] == '.' || p[-1] == '[' || p[-1] == '<') &&
                   (p[1] == '.' || p[1] == ']' || p[1] == '>')))
                lose = 1;
! #ifdef NO_HYPHENS_IN_FILENAMES
              else
                p[0] = '_';
! #endif /* NO_HYPHENS_IN_FILENAMES */
          /* count open brackets, reset close bracket pointer */
          if (p[0] == '[' || p[0] == '<')
            lbrack++, brack = 0;
***************
*** 1618,1629 ****
        }
        else
        {
! #ifndef VMS4_4
          if (*p == '-' &&
              o[-1] != '[' && o[-1] != '<' && o[-1] != '.' &&
              p[1] != ']' && p[1] != '>' && p[1] != '.')
            *p = '_';
! #endif /* VMS4_4 */
          *o++ = *p++;
        }
  #else /* not VMS */
--- 1618,1629 ----
        }
        else
        {
! #ifdef NO_HYPHENS_IN_FILENAMES
          if (*p == '-' &&
              o[-1] != '[' && o[-1] != '<' && o[-1] != '.' &&
              p[1] != ']' && p[1] != '>' && p[1] != '.')
            *p = '_';
! #endif /* NO_HYPHENS_IN_FILENAMES */
          *o++ = *p++;
        }
  #else /* not VMS */




reply via email to

[Prev in Thread] Current Thread [Next in Thread]