From d0065ff1244871c9eb40420b88fc89f9f008b587 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 4 Nov 2013 19:30:33 +0200 Subject: Fix bug #15260 with building and installing Emacs in non-ASCII directories. src/xdisp.c (message3_nolog, message_with_string): Encode the string before writing it to the terminal in a non-interactive session. src/lread.c (openp): If both FILENAME and SUFFIX are unibyte, make sure we concatenate them into a unibyte string. src/fileio.c (make_temp_name): Encode PREFIX, and decode the resulting temporary name before returning it to the caller. (Fexpand_file_name): If NAME is pure-ASCII and DEFAULT_DIRECTORY is a unibyte string, convert NAME to a unibyte string to ensure that the result is also a unibyte string. src/emacs.c (init_cmdargs): Use build_unibyte_string to make sure we create unibyte strings from default paths and directory/file names. src/coding.h (ENCODE_FILE): Do not attempt to encode a unibyte string. src/callproc.c (init_callproc): Use build_unibyte_string to make sure we create unibyte strings from default paths and directory/file names. src/buffer.c (init_buffer): Don't store default-directory of *scratch* in multibyte form. The original problem which led to that is described in http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-11/msg00532.html, but it was solved long ago. lisp/startup.el (normal-top-level): Move setting eol-mnemonic-unix, eol-mnemonic-mac, eol-mnemonic-dos, and also setup of the locale environment and decoding all of the default-directory's to here from command-line. (command-line): Decode also argv[0]. lisp/loadup.el: Error out if default-directory is a multibyte string when we are dumping. lisp/Makefile.in (emacs): Don't set LC_ALL=C. leim/Makefile.in (RUN_EMACS): Don't set LC_ALL=C. configure.ac: Don't disallow builds in non-ASCII directories. --- leim/ChangeLog | 4 ++++ leim/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'leim') diff --git a/leim/ChangeLog b/leim/ChangeLog index 9883995c68..6b16d71c21 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2013-11-04 Eli Zaretskii + + * Makefile.in (RUN_EMACS): Don't set LC_ALL=C. (Bug#15260) + 2013-11-03 Glenn Morris * Makefile.in (abs_srcdir): Remove. diff --git a/leim/Makefile.in b/leim/Makefile.in index c1a79a75d0..a5c05d567e 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -32,7 +32,7 @@ EMACS = ../src/emacs # How to run Emacs. # Prevent any setting of EMACSLOADPATH in user environment causing problems. -RUN_EMACS = unset EMACSLOADPATH; LC_ALL=C "${EMACS}" -batch \ +RUN_EMACS = unset EMACSLOADPATH; "${EMACS}" -batch \ --no-site-file --no-site-lisp MKDIR_P = @MKDIR_P@ -- cgit v1.2.3