Add kludge to prevent overriding keyboard-coding-system customization.

lisp/international/mule-cmds.el (set-locale-environment): Don't set
keyboard-coding-system if it is already set (reported by Friedrich
Delgado Friedrichs).

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

2 files changed, 11 insertions, 1 deletions

diff --git a/README.multi-tty b/README.multi-tty
index 0c1e4eb2739..091e9675ddf 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -218,6 +218,10 @@ THINGS TO DO
    settings as Emacs itself.  This may lead to bogus results in a
    multi-locale setup. (E.g., while logging in from a remote client
    with a different locale.)
+   (Update after new bugreport by Friedrich Delgado Friedrichs: 
+   (at least) the structs terminal_coding and keyboard_coding in
+   coding.c must be moved to struct display, and the Lisp interface
+   [set-]keyboard-coding-system must be adapted for the change.)
 
 ** The single-keyboard mode of MULTI_KBOARD is extremely confusing
    sometimes; Emacs does not respond to stimuli from other keyboards.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 24664f9fc64..d8683b53ec9 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2400,7 +2400,13 @@ See also `locale-charset-language-names', `locale-language-names',
           ;; Set the `keyboard-coding-system' if appropriate (tty
           ;; only).  At least X and MS Windows can generate
           ;; multilingual input.
-          (unless window-system
+          (unless (or window-system
+                      keyboard-coding-system)
+            ;; FIXME: keyboard-coding-system must be removed from the above
+            ;; condition when multi-tty locale handling is correctly
+            ;; implemented.  Also, unconditionally overriding it with nil
+            ;; is not a good idea, as it ignores the user's
+            ;; customization. -- lorentey
             (let ((kcs (or coding-system
                            (car (get-language-info language-name
                                                    'coding-system)))))