[Emacs-diffs] trunk r114815: Fix part of bug #15260 with from directory with a non-ASCII name.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114815
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15260
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-10-26 16:43:58 +0300
message:
  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'.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-26 03:13:18 +0000
+++ b/src/ChangeLog     2013-10-26 13:43:58 +0000
@@ -1,3 +1,8 @@
+2013-10-26  Eli Zaretskii  <address@hidden>
+
+       * emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments
+       before passing them to 'unexec'.  (Bug#15260)
+
 2013-10-26  Xue Fuqiao  <address@hidden>
 
        * fringe.c (set_fringe_bitmap_face): Add usage note from lispref.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2013-10-20 16:47:42 +0000
+++ b/src/emacs.c       2013-10-26 13:43:58 +0000
@@ -2044,11 +2044,15 @@
 
   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;