Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
9a1dc3be
Commit
9a1dc3be
authored
Apr 29, 1996
by
Richard M. Stallman
Browse files
(Fexpand_file_name) [DOS_NT]: Keep dir sep following ~
or ~user, but don't collapse the newdir prefix in that case.
parent
de5c39cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
src/fileio.c
src/fileio.c
+4
-7
No files found.
src/fileio.c
View file @
9a1dc3be
...
...
@@ -786,6 +786,7 @@ See also the function `substitute-in-file-name'.")
#endif /* VMS */
#ifdef DOS_NT
int drive = 0;
int collapse_newdir = 1;
#endif /* DOS_NT */
int length;
Lisp_Object handler;
...
...
@@ -1100,9 +1101,7 @@ See also the function `substitute-in-file-name'.")
newdir = (unsigned char *) "";
nm++;
#ifdef DOS_NT
if (IS_DIRECTORY_SEP (nm[0]))
/* Make nm look like a relative file name. */
nm++;
collapse_newdir = 0;
#endif
#ifdef VMS
nm++; /* Don't leave the slash in nm. */
...
...
@@ -1128,9 +1127,7 @@ See also the function `substitute-in-file-name'.")
#else
nm = p;
#ifdef DOS_NT
if (IS_DIRECTORY_SEP (nm[0]))
/* Make nm look like a relative name. */
nm++;
collapse_newdir = 0;
#endif
#endif /* VMS */
}
...
...
@@ -1234,7 +1231,7 @@ See also the function `substitute-in-file-name'.")
/* Keep only a prefix from newdir if nm starts with slash
(//server/share for UNC, nothing otherwise). */
if (IS_DIRECTORY_SEP (nm[0]))
if (IS_DIRECTORY_SEP (nm[0])
&& collapse_newdir
)
{
#ifdef WINDOWSNT
if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1]))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment