martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Fexpand_file_name): Fix previous change.

Browse Source
This commit is contained in:
Kenichi Handa
2003-03-21 05:45:23 +00:00
parent f0ec17115f
commit 3f817c7366
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View 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

16
src/fileio.c
View 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 */