(encoded-kbd-setup-keymap): Fix previous change.

2 files changed, 26 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5134b2647f..e12449df8e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2004-08-04  Kenichi Handa  <handa@m17n.org>
+
+        * international/encoded-kb.el (encoded-kbd-setup-keymap): Fix
+        previous change.
+
+2004-08-03  Kenichi Handa  <handa@m17n.org>
+
+        * international/encoded-kb.el: The following changes are to
+        utilize key-translation-map instead of minor mode map.
+        (encoded-kbd-iso2022-non-ascii-map): Delete it.
+        (encoded-kbd-coding, encoded-kbd-handle-8bit): Delete them.
+        (encoded-kbd-last-key): New function.
+        (encoded-kbd-iso2022-single-shift): New function.
+        (encoded-kbd-iso2022-designation)
+        (encoded-kbd-self-insert-iso2022-7bit)
+        (encoded-kbd-self-insert-iso2022-8bit)
+        (encoded-kbd-self-insert-sjis, encoded-kbd-self-insert-big5)
+        (encoded-kbd-self-insert-ccl): Make them suitable for bindings in
+        key-translation-map.
+        (encoded-kbd-setup-keymap): Setup key-translation-map.
+        (saved-key-translation-map): New variable.
+        (encoded-kbd-mode): Save/restore key-translation-map.  Adjusted
+        for the change of encoded-kbd-setup-keymap.
+
 2004-08-02  Kim F. Storm  <storm@cua.dk>
 
         * avoid.el (mouse-avoidance-point-position): Use window-inside-edges
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index 962f741c81c..cba2f0e45b9 100644
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -181,7 +181,7 @@ The following key sequence may cause multilingual text insertion."
    ((eq (coding-system-type coding) 1)  ; SJIS
     (let ((i 128))
       (while (< i 256)
-        (define-key encoded-kbd-mode-map
+        (define-key key-translation-map
           (vector i) 'encoded-kbd-self-insert-sjis)
         (setq i (1+ i))))
     8)
@@ -189,7 +189,7 @@ The following key sequence may cause multilingual text insertion."
    ((eq (coding-system-type coding) 3)  ; Big5
     (let ((i 161))
       (while (< i 255)
-        (define-key encoded-kbd-mode-map
+        (define-key key-translation-map
           (vector i) 'encoded-kbd-self-insert-big5)
         (setq i (1+ i))))
     8)