From c556b44bd53f77077d4a92baba6fa381f6400d5b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 26 Oct 2013 16:43:58 +0300 Subject: [PATCH] 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'. --- src/ChangeLog | 5 +++++ src/emacs.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 + + * emacs.c (Fdump_emacs): Encode FILENAME and SYMFILE arguments + before passing them to 'unexec'. (Bug#15260) + 2013-10-26 Xue Fuqiao * 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; -- 2.39.5