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
58fc9587
Commit
58fc9587
authored
Feb 14, 1995
by
Richard M. Stallman
Browse files
(Fexpand_file_name): Copy default-directory
before looking for a handler on the directory arg.
parent
0ce62eb2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
src/fileio.c
src/fileio.c
+6
-5
No files found.
src/fileio.c
View file @
58fc9587
...
...
@@ -745,6 +745,12 @@ See also the function `substitute-in-file-name'.")
handler = Ffind_file_name_handler (name, Qexpand_file_name);
if (!NILP (handler))
return call3 (handler, Qexpand_file_name, name, defalt);
/* Use the buffer's default-directory if DEFALT is omitted. */
if (NILP (defalt))
defalt = current_buffer->directory;
CHECK_STRING (defalt, 1);
if (!NILP (defalt))
{
handler = Ffind_file_name_handler (defalt, Qexpand_file_name);
...
...
@@ -752,11 +758,6 @@ See also the function `substitute-in-file-name'.")
return call3 (handler, Qexpand_file_name, name, defalt);
}
/* Use the buffer's default-directory if DEFALT is omitted. */
if (NILP (defalt))
defalt = current_buffer->directory;
CHECK_STRING (defalt, 1);
o = XSTRING (defalt)->data;
/* Make sure DEFALT is properly expanded.
...
...
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