diff options
| author | Richard M. Stallman | 1996-10-26 18:16:11 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-10-26 18:16:11 +0000 |
| commit | f88a6649b823f675b71cb0a26e3414bb47891d96 (patch) | |
| tree | a0094d283839f163098dba66fb312619b83a19fd /src | |
| parent | b8a3aefac98afc8e6f1c13be6623c059161c6563 (diff) | |
| download | emacs-f88a6649b823f675b71cb0a26e3414bb47891d96.tar.gz emacs-f88a6649b823f675b71cb0a26e3414bb47891d96.zip | |
(Fexpand_file_name): No longer discard .../ before another / or ~.
That is now only in Fsubstitute_in_file_name.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/fileio.c b/src/fileio.c index bd7adb56da2..7c08284728a 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -901,29 +901,6 @@ See also the function `substitute-in-file-name'.") | |||
| 901 | } | 901 | } |
| 902 | #endif /* DOS_NT */ | 902 | #endif /* DOS_NT */ |
| 903 | 903 | ||
| 904 | /* Handle // and /~ in middle of file name | ||
| 905 | by discarding everything through the first / of that sequence. */ | ||
| 906 | p = nm; | ||
| 907 | while (*p) | ||
| 908 | { | ||
| 909 | /* Since we are expecting the name to be absolute, we can assume | ||
| 910 | that each element starts with a "/". */ | ||
| 911 | |||
| 912 | if (IS_DIRECTORY_SEP (p[0]) && IS_DIRECTORY_SEP (p[1]) | ||
| 913 | #if defined (APOLLO) || defined (WINDOWSNT) | ||
| 914 | /* // at start of filename is meaningful on Apollo | ||
| 915 | and WindowsNT systems */ | ||
| 916 | && nm != p | ||
| 917 | #endif /* APOLLO || WINDOWSNT */ | ||
| 918 | ) | ||
| 919 | nm = p + 1; | ||
| 920 | |||
| 921 | if (IS_DIRECTORY_SEP (p[0]) && p[1] == '~') | ||
| 922 | nm = p + 1; | ||
| 923 | |||
| 924 | p++; | ||
| 925 | } | ||
| 926 | |||
| 927 | #ifdef WINDOWSNT | 904 | #ifdef WINDOWSNT |
| 928 | /* Discard any previous drive specifier if nm is now in UNC format. */ | 905 | /* Discard any previous drive specifier if nm is now in UNC format. */ |
| 929 | if (IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) | 906 | if (IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) |