]> git.eshelyaron.com Git - emacs.git/commitdiff
(Fexpand_file_name): Fix previous change.
authorKenichi Handa <handa@m17n.org>
Fri, 21 Mar 2003 05:45:23 +0000 (05:45 +0000)
committerKenichi Handa <handa@m17n.org>
Fri, 21 Mar 2003 05:45:23 +0000 (05:45 +0000)
src/ChangeLog
src/fileio.c

index 607cc02fa2500588d6b385bf0c6355b642544d7d..3c67529536c915f41b43194f42ab1d3bb027c7a4 100644 (file)
@@ -1,3 +1,7 @@
+2003-03-21  Kenichi Handa  <handa@etlken2>
+
+       * fileio.c (Fexpand_file_name): Fix previous change.
+
 2003-03-19  Kenichi Handa  <handa@etlken2>
 
        * fileio.c (Ffile_name_directory): Reconstruct file name by
index a75a0e22b75acb7d5ccb87e2dacd978980ccff52..4f85aa1d6ad0fc99f8c8855ab19111704c5cfe39 100644 (file)
@@ -1289,20 +1289,20 @@ See also the function `substitute-in-file-name'.  */)
          if (IS_DIRECTORY_SEP (nm[1]))
            {
              if (strcmp (nm, SDATA (name)) != 0)
-               name
-                 = make_specified_string (nm, -1, strlen (nm),
-                                          STRING_MULTIBYTE (name));
+               name = make_specified_string (nm, -1, strlen (nm),
+                                             STRING_MULTIBYTE (name));
            }
          else
 #endif
          /* drive must be set, so this is okay */
          if (strcmp (nm - 2, SDATA (name)) != 0)
            {
-             name
-               = make_specified_string (nm, -1, strlen (nm),
-                                        STRING_MULTIBYTE (name));
-             SSET (name, 0, DRIVE_LETTER (drive));
-             SSET (name, 1, ':');
+             char temp[] = " :";
+
+             name = make_specified_string (nm, -1, p - nm,
+                                           STRING_MULTIBYTE (name));
+             temp[0] = DRIVE_LETTER (drive);
+             name = concat2 (build_string (temp), name);
            }
          return name;
 #else /* not DOS_NT */