[Emacs-diffs] emacs-24 r117683: * callproc.c (encode_current_directory): Encode dir at the end.

[Michael Albinus]

------------------------------------------------------------
revno: 117683
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-11-07 21:09:34 +0100
message:
  * callproc.c (encode_current_directory): Encode dir at the end.
modified:
  src/callproc.c                 callproc.c-20091113204419-o5vbwnq5f7feedwu-248

=== modified file 'src/callproc.c'
--- a/src/callproc.c    2014-11-07 17:04:10 +0000
+++ b/src/callproc.c    2014-11-07 20:09:34 +0000
@@ -150,8 +150,6 @@
 
   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 @@
   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);
 }