From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 7 Nov 2014 20:09:34 +0000 (+0100)
Subject: * callproc.c (encode_current_directory): Encode dir at the end.
X-Git-Tag: emacs-24.4.90~254
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=499a7f1cdb8239eed2bc15417f55d2bbeba155d5;p=emacs.git

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

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);
 }