From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 26 Oct 2013 13:43:58 +0000 (+0300)
Subject: Fix part of bug #15260 with from directory with a non-ASCII name.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c556b44bd53f77077d4a92baba6fa381f6400d5b;p=emacs.git

Fix part of bug #15260 with from directory with a non-ASCII name.

 src/emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments
 before passing them to 'unexec'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f625044067d..e1c85624573 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-26  Eli Zaretskii  <eliz@gnu.org>
+
+	* emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments
+	before passing them to 'unexec'.  (Bug#15260)
+
 2013-10-26  Xue Fuqiao  <xfq.free@gmail.com>
 
 	* fringe.c (set_fringe_bitmap_face): Add usage note from lispref.
diff --git a/src/emacs.c b/src/emacs.c
index 540084abc44..b5d281da317 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2044,11 +2044,15 @@ You must run Emacs in batch mode in order to dump it.  */)
 
   CHECK_STRING (filename);
   filename = Fexpand_file_name (filename, Qnil);
+  filename = ENCODE_FILE (filename);
   if (!NILP (symfile))
     {
       CHECK_STRING (symfile);
       if (SCHARS (symfile))
-	symfile = Fexpand_file_name (symfile, Qnil);
+	{
+	  symfile = Fexpand_file_name (symfile, Qnil);
+	  symfile = ENCODE_FILE (symfile);
+	}
     }
 
   tem = Vpurify_flag;