From 499a7f1cdb8239eed2bc15417f55d2bbeba155d5 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 7 Nov 2014 21:09:34 +0100 Subject: [PATCH] * callproc.c (encode_current_directory): Encode dir at the end. --- src/callproc.c | 5 +++-- 1 file 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); } -- 2.11.4.GIT