2 files changed, 13 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33ad463b623..433786a1c83 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-15  Dave Love  <fx@gnu.org>
+
+        * international/mule-cmds.el (set-locale-environment): Comment out
+        set-keyboard-coding-system stuff.
+
 2002-05-14  Kenichi Handa  <handa@etl.go.jp>
 
         * international/mule.el (define-coding-system): Docstring
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index dde728f419d..f8ab55fc2bf 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1954,12 +1954,14 @@ See also `locale-charset-language-names', `locale-language-names',
           (when default-enable-multibyte-characters
             (set-display-table-and-terminal-coding-system language-name))
 
-          ;; Set the `keyboard-coding-system' if appropriate.
-          (let ((kcs (or coding-system
-                         (car (get-language-info language-name
-                                                 'coding-system)))))
-            (if (memq kcs standard-keyboard-coding-systems)
-                (set-keyboard-coding-system kcs)))
+;;; encoded-kbd-mode doesn't work properly at present, and i don't
+;;; think this is the right thing to do anyhow.  -- fx
+;;;       ;; Set the `keyboard-coding-system' if appropriate.
+;;;       (let ((kcs (or coding-system
+;;;                      (car (get-language-info language-name
+;;;                                              'coding-system)))))
+;;;         (if (memq kcs standard-keyboard-coding-systems)
+;;;             (set-keyboard-coding-system kcs)))
 
           (setq locale-coding-system
                 (car (get-language-info language-name 'coding-priority))))