* callproc.c (encode_current_directory): Encode dir at the end.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 73424daaa0c..21741ad8740 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -150,8 +150,6 @@ encode_current_directory (void)
 
   dir = expand_and_dir_to_file (dir, Qnil);
 
-  if (STRING_MULTIBYTE (dir))
-    dir = ENCODE_FILE (dir);
   if (NILP (Ffile_accessible_directory_p (dir)))
     report_file_error ("Setting current directory",
                        BVAR (current_buffer, directory));
@@ -160,6 +158,9 @@ encode_current_directory (void)
   if (! NILP (Fstring_match (build_string ("^/:"), dir, Qnil)))
     dir = Fsubstring (dir, make_number (2), Qnil);
 
+  if (STRING_MULTIBYTE (dir))
+    dir = ENCODE_FILE (dir);
+
   RETURN_UNGCPRO (dir);
 }