diff options
| author | Kenichi Handa <handa@m17n.org> | 2007-03-22 12:15:04 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2007-03-22 12:15:04 +0000 |
| commit | 2f868094f45bbcad7b3e3e2943a9ba13e56b9660 (patch) | |
| tree | 9cbf3decb5351fe8d907d9a6350598ca48f73aa2 /src/fileio.c | |
| parent | 28a419dd4600db69758c82633f0def217f233b00 (diff) | |
| download | emacs-2f868094f45bbcad7b3e3e2943a9ba13e56b9660.tar.gz emacs-2f868094f45bbcad7b3e3e2943a9ba13e56b9660.tar.bz2 emacs-2f868094f45bbcad7b3e3e2943a9ba13e56b9660.zip | |
(Fcopy_file): Call barf_or_query_if_file_exists with
non-encoded file name.
(Frename_file): Likewise.
(Fadd_name_to_file): Likewise.
(Fmake_symbolic_link): Likewise.
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 3523c5cb487..7156f22f57e 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2471,7 +2471,7 @@ uid and gid of FILE to NEWNAME. */) if (NILP (ok_if_already_exists) || INTEGERP (ok_if_already_exists)) - barf_or_query_if_file_exists (encoded_newname, "copy to it", + barf_or_query_if_file_exists (newname, "copy to it", INTEGERP (ok_if_already_exists), &out_st, 0); else if (stat (SDATA (encoded_newname), &out_st) < 0) out_st.st_mode = 0; @@ -2780,7 +2780,7 @@ This is what happens in interactive use with M-x. */) #endif if (NILP (ok_if_already_exists) || INTEGERP (ok_if_already_exists)) - barf_or_query_if_file_exists (encoded_newname, "rename to it", + barf_or_query_if_file_exists (newname, "rename to it", INTEGERP (ok_if_already_exists), 0, 0); #ifndef BSD4_1 if (0 > rename (SDATA (encoded_file), SDATA (encoded_newname))) @@ -2857,7 +2857,7 @@ This is what happens in interactive use with M-x. */) if (NILP (ok_if_already_exists) || INTEGERP (ok_if_already_exists)) - barf_or_query_if_file_exists (encoded_newname, "make it a new name", + barf_or_query_if_file_exists (newname, "make it a new name", INTEGERP (ok_if_already_exists), 0, 0); unlink (SDATA (newname)); @@ -2918,7 +2918,7 @@ This happens for interactive use with M-x. */) if (NILP (ok_if_already_exists) || INTEGERP (ok_if_already_exists)) - barf_or_query_if_file_exists (encoded_linkname, "make it a link", + barf_or_query_if_file_exists (linkname, "make it a link", INTEGERP (ok_if_already_exists), 0, 0); if (0 > symlink (SDATA (encoded_filename), SDATA (encoded_linkname))) |