Mercurial > emacs

changeset 76664:0e62a7c60f43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Kenichi Handa <handa@m17n.org>
date Thu, 22 Mar 2007 12:15:04 +0000
parents 08f39efbb4c2
children e9ffa966dae2
files src/fileio.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/fileio.c	Thu Mar 22 10:22:36 2007 +0000
+++ b/src/fileio.c	Thu Mar 22 12:15:04 2007 +0000
@@ -2471,7 +2471,7 @@
 
   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 @@
 #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 @@
 
   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 @@
 
   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)))