Fix terminal coding system in multibyte locales (rep. by Friedrich Delgado Friedrichs).

lisp/international/mule-cmds.el (configure-display-for-locale):
Override default-enable-multibyte-characters when setting up the
terminal coding system.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-176

1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 7aed6a95e7c..c9c462f028e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2385,7 +2385,11 @@ given locale."
         ;; we are using single-byte characters,
         ;; so the display table and terminal coding system are irrelevant.
         (when default-enable-multibyte-characters
-          (set-display-table-and-terminal-coding-system language-name))
+          ;; Override default-terminal-coding-system in case the
+          ;; display coding can not be derived from the language
+          ;; environment.
+          (let ((default-terminal-coding-system coding-system))
+            (set-display-table-and-terminal-coding-system language-name)))
 
         ;; Set the `keyboard-coding-system' if appropriate (tty
         ;; only).  At least X and MS Windows can generate