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

[Ken Raeburn]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.454 emacs/src/fileio.c:1.455
*** emacs/src/fileio.c:1.454    Sun Jul 14 20:00:36 2002
--- emacs/src/fileio.c  Tue Jul 16 11:49:16 2002
***************
*** 270,276 ****
        /* System error messages are capitalized.  Downcase the initial
           unless it is followed by a slash.  */
        if (SREF (errstring, 1) != '/')
!         SREF (errstring, 0) = DOWNCASE (SREF (errstring, 0));
  
        Fsignal (Qfile_error,
                 Fcons (build_string (string), Fcons (errstring, data)));
--- 270,276 ----
        /* System error messages are capitalized.  Downcase the initial
           unless it is followed by a slash.  */
        if (SREF (errstring, 1) != '/')
!         SSET (errstring, 0, DOWNCASE (SREF (errstring, 0)));
  
        Fsignal (Qfile_error,
                 Fcons (build_string (string), Fcons (errstring, data)));
***************
*** 1301,1308 ****
          if (strcmp (nm - 2, SDATA (name)) != 0)
            {
              name = make_string (nm - 2, p - nm + 2);
!             SREF (name, 0) = DRIVE_LETTER (drive);
!             SREF (name, 1) = ':';
            }
          return name;
  #else /* not DOS_NT */
--- 1301,1308 ----
          if (strcmp (nm - 2, SDATA (name)) != 0)
            {
              name = make_string (nm - 2, p - nm + 2);
!             SSET (name, 0, DRIVE_LETTER (drive));
!             SSET (name, 1, ':');
            }
          return name;
  #else /* not DOS_NT */
***************
*** 6015,6036 ****
    if (homedir != 0
        && STRINGP (dir)
        && !strncmp (homedir, SDATA (dir), strlen (homedir))
!       && IS_DIRECTORY_SEP (SDATA (dir)[strlen (homedir)]))
      {
        dir = make_string (SDATA (dir) + strlen (homedir) - 1,
                         SBYTES (dir) - strlen (homedir) + 1);
!       SREF (dir, 0) = '~';
      }
    /* Likewise for default_filename.  */
    if (homedir != 0
        && STRINGP (default_filename)
        && !strncmp (homedir, SDATA (default_filename), strlen (homedir))
!       && IS_DIRECTORY_SEP (SDATA (default_filename)[strlen (homedir)]))
      {
        default_filename
        = make_string (SDATA (default_filename) + strlen (homedir) - 1,
                       SBYTES (default_filename) - strlen (homedir) + 1);
!       SREF (default_filename, 0) = '~';
      }
    if (!NILP (default_filename))
      {
--- 6015,6036 ----
    if (homedir != 0
        && STRINGP (dir)
        && !strncmp (homedir, SDATA (dir), strlen (homedir))
!       && IS_DIRECTORY_SEP (SREF (dir, strlen (homedir))))
      {
        dir = make_string (SDATA (dir) + strlen (homedir) - 1,
                         SBYTES (dir) - strlen (homedir) + 1);
!       SSET (dir, 0, '~');
      }
    /* Likewise for default_filename.  */
    if (homedir != 0
        && STRINGP (default_filename)
        && !strncmp (homedir, SDATA (default_filename), strlen (homedir))
!       && IS_DIRECTORY_SEP (SREF (default_filename, strlen (homedir))))
      {
        default_filename
        = make_string (SDATA (default_filename) + strlen (homedir) - 1,
                       SBYTES (default_filename) - strlen (homedir) + 1);
!       SSET (default_filename, 0, '~');
      }
    if (!NILP (default_filename))
      {