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 f625044067dd425bf591c49144f9c88bc35f0625..e1c85624573396bc2292079f45fc3e584974374f 100644 (file)
--- 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 540084abc44064c782cda931308ae2a36e8ea29e..b5d281da317a6c111901d4c05ee6dd8ec8cc3e4b 100644 (file)
--- 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;