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.

diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index 6eae1011c40cf615ad2cc8a28eec908bd207d8d0..962f741c81c50fb36d43dea3e832c00f0333ba11 100644 (file)
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -24,6 +24,10 @@
 
 ;;; Code:
 
+;; Usually this map is empty (even if Encoded-kbd mode is on), but if
+;; the keyboard coding system is iso-2022-based, it defines dummy key
+;; bindings for ESC $ ..., etc. so that those bindings in
+;; key-translation-map take effect.
 (defconst encoded-kbd-mode-map (make-sparse-keymap)
   "Keymap for Encoded-kbd minor mode.")
 
@@ -69,25 +73,6 @@
 (fset 'encoded-kbd-iso2022-designation-prefix
       encoded-kbd-iso2022-designation-map)
 
-(defvar encoded-kbd-iso2022-non-ascii-map
-  (let ((map (make-keymap))
-       (i 32))
-    (while (< i 128)
-      (define-key map (char-to-string i) 'encoded-kbd-self-insert-iso2022-7bit)
-      (setq i (1+ i)))
-    (define-key map "\e" 'encoded-kbd-iso2022-esc-prefix)
-    (setq i 160)
-    (while (< i 256)
-      (define-key map (vector i) 'encoded-kbd-handle-8bit)
-      (setq i (1+ i)))
-    map)
-  "Keymap for handling non-ASCII character set in Encoded-kbd mode.")
-
-;; One of the symbols `sjis', `iso2022-7', `iso2022-8', or `big5' to
-;; denote what kind of coding-system we are now handling in
-;; Encoded-kbd mode.
-(defvar encoded-kbd-coding nil)
-
 ;; Keep information of designation state of ISO2022 encoding.  When
 ;; Encoded-kbd mode is on, this is set to a vector of length 4, the
 ;; elements are character sets currently designated to graphic
@@ -104,11 +89,14 @@
 (defvar encoded-kbd-iso2022-invocations nil)
 (put 'encoded-kbd-iso2022-invocations 'permanent-local t)
 
-(defun encoded-kbd-iso2022-designation ()
+(defsubst encoded-kbd-last-key ()
+  (let ((keys (this-single-command-keys)))
+    (aref keys (1- (length keys)))))
+
+(defun encoded-kbd-iso2022-designation (ignore)
   "Do ISO2022 designation according to the current key in Encoded-kbd mode.
 The following key sequence may cause multilingual text insertion."
-  (interactive)
-  (let ((key-seq (this-command-keys))
+  (let ((key-seq (this-single-command-keys))
        (prev-g0-charset (aref encoded-kbd-iso2022-designations
                               (aref encoded-kbd-iso2022-invocations 0)))
        intermediate-char final-char
@@ -132,143 +120,122 @@ The following key sequence may cause multilingual text insertion."
              chars (if (< intermediate-char ?,) 94 96)
              final-char (aref key-seq 2)
              reg (mod intermediate-char 4))))
-    (if (setq charset (iso-charset dimension chars final-char))
-       (aset encoded-kbd-iso2022-designations reg charset)
-      (error "Character set of DIMENSION %s, CHARS %s, FINAL-CHAR `%c' is not supported"
-            dimension chars final-char))
-
-    (if (memq (aref encoded-kbd-iso2022-designations
-                   (aref encoded-kbd-iso2022-invocations 0))
-             '(ascii latin-jisx0201))
-       ;; Graphic plane 0 (0x20..0x7f) is for ASCII.  We don't have
-       ;; to handle characters in this range specially.
-       (if (not (memq prev-g0-charset '(ascii latin-jisx0201)))
-           ;; We must exit recursive edit now.
-           (throw 'exit nil))
-      ;; Graphic plane 0 is for non-ASCII.
-      (if (memq prev-g0-charset '(ascii latin-jisx0201))
-         ;; We must handle keys specially.
-         (let ((overriding-local-map encoded-kbd-iso2022-non-ascii-map))
-           (recursive-edit))))))
-
-(defun encoded-kbd-handle-8bit ()
-  "Handle an 8-bit character entered in Encoded-kbd mode."
-  (interactive)
-  (cond ((eq encoded-kbd-coding 'iso2022-7)
-        (error "Can't handle the character code %d" last-command-char))
-
-       ((eq encoded-kbd-coding 'iso2022-8)
-        (cond ((= last-command-char ?\216)
-               (aset encoded-kbd-iso2022-invocations 2 2))
-
-              ((= last-command-char ?\217)
-               (aset encoded-kbd-iso2022-invocations 2 3))
-
-              ((>= last-command-char ?\240)
-               (encoded-kbd-self-insert-iso2022-8bit))
-
-              (t
-               (error "Can't handle the character code %d"
-                      last-command-char))))
-
-       ((eq encoded-kbd-coding 'sjis)
-        (encoded-kbd-self-insert-sjis))
-
-       (t
-        (encoded-kbd-self-insert-big5))))
-
-(defun encoded-kbd-self-insert-iso2022-7bit ()
-  (interactive)
-  (let* ((charset (aref encoded-kbd-iso2022-designations
-                       (or (aref encoded-kbd-iso2022-invocations 2)
-                           (aref encoded-kbd-iso2022-invocations 0))))
-        (char (if (= (charset-dimension charset) 1)
-                  (make-char charset last-command-char)
-                (make-char charset last-command-char (read-char-exclusive)))))
+    (aset encoded-kbd-iso2022-designations reg
+         (iso-charset dimension chars final-char)))
+  "")
+
+(defun encoded-kbd-iso2022-single-shift (ignore)
+  (let ((char (encoded-kbd-last-key)))
+    (aset encoded-kbd-iso2022-invocations 2
+         (aref encoded-kbd-iso2022-designations
+               (if (= char ?\216) 2 3))))
+  "")
+
+(defun encoded-kbd-self-insert-iso2022-7bit (ignore)
+  (let ((char (encoded-kbd-last-key))
+       (charset (aref encoded-kbd-iso2022-designations
+                      (or (aref encoded-kbd-iso2022-invocations 2)
+                          (aref encoded-kbd-iso2022-invocations 0)))))
     (aset encoded-kbd-iso2022-invocations 2 nil)
-    (setq unread-command-events (cons char unread-command-events))))
-
-(defun encoded-kbd-self-insert-iso2022-8bit ()
-  (interactive)
-  (cond
-   ((= last-command-char ?\216)                ; SS2 (Single Shift 2)
-    (aset encoded-kbd-iso2022-invocations 2 2))
-   ((= last-command-char ?\217)                ; SS3 (Single Shift 3)
-    (aset encoded-kbd-iso2022-invocations 2 3))
-   (t
-    (let* ((charset (aref encoded-kbd-iso2022-designations
-                         (or (aref encoded-kbd-iso2022-invocations 2)
-                             (aref encoded-kbd-iso2022-invocations 1))))
-          (char (if (= (charset-dimension charset) 1)
-                    (make-char charset last-command-char)
-                  (make-char charset last-command-char
-                             (read-char-exclusive)))))
-      (aset encoded-kbd-iso2022-invocations 2 nil)
-      (setq unread-command-events (cons char unread-command-events))))))
-
-(defun encoded-kbd-self-insert-sjis ()
-  (interactive)
-  (let ((char (if (or (< last-command-char ?\xA0) (>= last-command-char ?\xE0))
-                 (decode-sjis-char (+ (ash last-command-char 8)
-                                      (read-char-exclusive)))
-               (make-char 'katakana-jisx0201 last-command-char))))
-    (setq unread-command-events (cons char unread-command-events))))
-
-(defun encoded-kbd-self-insert-big5 ()
-  (interactive)
-  (let ((char (decode-big5-char (+ (ash last-command-char 8)
-                                  (read-char-exclusive)))))
-    (setq unread-command-events (cons char unread-command-events))))
-
-(defun encoded-kbd-self-insert-ccl ()
-  (interactive)
-  (let ((str (char-to-string last-command-char))
+    (vector (if (= (charset-dimension charset) 1)
+               (make-char charset char)
+             (make-char charset char (read-char-exclusive))))))
+
+(defun encoded-kbd-self-insert-iso2022-8bit (ignore)
+  (let ((char (encoded-kbd-last-key))
+       (charset (aref encoded-kbd-iso2022-designations
+                      (or (aref encoded-kbd-iso2022-invocations 2)
+                          (aref encoded-kbd-iso2022-invocations 1)))))
+    (aset encoded-kbd-iso2022-invocations 2 nil)
+    (vector (if (= (charset-dimension charset) 1)
+               (make-char charset char)
+             (make-char charset char (read-char-exclusive))))))
+
+(defun encoded-kbd-self-insert-sjis (ignore)
+  (let ((char (encoded-kbd-last-key)))
+    (vector
+     (if (or (< char ?\xA0) (>= char ?\xE0))
+        (decode-sjis-char (+ (ash char 8) (read-char-exclusive)))
+       (make-char 'katakana-jisx0201 char)))))
+
+(defun encoded-kbd-self-insert-big5 (ignore)
+  (let ((char (encoded-kbd-last-key)))
+    (vector 
+     (decode-big5-char (+ (ash char 8) (read-char-exclusive))))))
+
+(defun encoded-kbd-self-insert-ccl (ignore)
+  (let ((str (char-to-string (encoded-kbd-last-key)))
        (ccl (car (aref (coding-system-spec (keyboard-coding-system)) 4)))
        (vec [nil nil nil nil nil nil nil nil nil])
        result)
     (while (= (length (setq result (ccl-execute-on-string ccl vec str t))) 0)
       (dotimes (i 9) (aset vec i nil))
       (setq str (format "%s%c" str (read-char-exclusive))))
-    (setq unread-command-events
-         (append result unread-command-events))))
+    (vector (aref result 0))))
 
 (defun encoded-kbd-setup-keymap (coding)
   ;; At first, reset the keymap.
-  (setcdr encoded-kbd-mode-map nil)
+  (define-key encoded-kbd-mode-map "\e" nil)
   ;; Then setup the keymap according to the keyboard coding system.
   (cond
-   ((eq encoded-kbd-coding 'sjis)
+   ((eq (coding-system-type coding) 1) ; SJIS
     (let ((i 128))
       (while (< i 256)
        (define-key encoded-kbd-mode-map
          (vector i) 'encoded-kbd-self-insert-sjis)
-       (setq i (1+ i)))))
+       (setq i (1+ i))))
+    8)
 
-   ((eq encoded-kbd-coding 'big5)
+   ((eq (coding-system-type coding) 3) ; Big5
     (let ((i 161))
       (while (< i 255)
        (define-key encoded-kbd-mode-map
          (vector i) 'encoded-kbd-self-insert-big5)
-       (setq i (1+ i)))))
-
-   ((eq encoded-kbd-coding 'iso2022-7)
-    (define-key encoded-kbd-mode-map "\e" 'encoded-kbd-iso2022-esc-prefix))
-
-   ((eq encoded-kbd-coding 'iso2022-8)
-    (define-key encoded-kbd-mode-map
-      (vector ?\216) 'encoded-kbd-self-insert-iso2022-8bit)
-    (define-key encoded-kbd-mode-map
-      (vector ?\217) 'encoded-kbd-self-insert-iso2022-8bit)
-    (let ((i 160))
-      (while (< i 256)
-       (define-key encoded-kbd-mode-map
-         (vector i) 'encoded-kbd-self-insert-iso2022-8bit)
-       (setq i (1+ i)))))
-
-   ((eq encoded-kbd-coding 'ccl)
+       (setq i (1+ i))))
+    8)
+
+   ((eq (coding-system-type coding) 2) ; ISO-2022
+    (let ((flags (coding-system-flags coding))
+         use-designation)
+      (if (aref flags 8)
+         nil                           ; Don't support locking-shift.
+       (setq encoded-kbd-iso2022-designations (make-vector 4 nil)
+             encoded-kbd-iso2022-invocations (make-vector 3 nil))
+       (dotimes (i 4)
+         (if (aref flags i)
+             (if (charsetp (aref flags i))
+                 (aset encoded-kbd-iso2022-designations
+                       i (aref flags i))
+               (setq use-designation t)
+               (if (charsetp (car-safe (aref flags i)))
+                   (aset encoded-kbd-iso2022-designations
+                         i (car (aref flags i)))))))
+       (aset encoded-kbd-iso2022-invocations 0 0)
+       (if (aref encoded-kbd-iso2022-designations 1)
+           (aset encoded-kbd-iso2022-invocations 1 1))
+       (when use-designation
+         (define-key encoded-kbd-mode-map "\e" 'encoded-kbd-iso2022-esc-prefix)
+         (define-key key-translation-map "\e" 'encoded-kbd-iso2022-esc-prefix))
+       (when (or (aref flags 2) (aref flags 3))
+         (define-key key-translation-map
+           [?\216] 'encoded-kbd-iso2022-single-shift)
+         (define-key key-translation-map
+           [?\217] 'encoded-kbd-iso2022-single-shift))
+       (or (eq (aref flags 0) 'ascii)
+           (dotimes (i 96)
+             (define-key key-translation-map
+               (vector (+ 32 i)) 'encoded-kbd-self-insert-iso2022-7bit)))
+       (if (aref flags 7)
+           t
+         (dotimes (i 96)
+           (define-key key-translation-map
+             (vector (+ 160 i)) 'encoded-kbd-self-insert-iso2022-8bit))
+         8))))
+
+   ((eq (coding-system-type coding) 4) ; CCL-base
     (let ((valid-codes (or (coding-system-get coding 'valid-codes)
                           '((128 . 255))))
-         elt from to)
+         elt from to valid)
       (while valid-codes
        (setq elt (car valid-codes) valid-codes (cdr valid-codes))
        (if (consp elt)
@@ -276,13 +243,17 @@ The following key sequence may cause multilingual text insertion."
          (setq from (setq to elt)))
        (while (<= from to)
          (if (>= from 128)
-             (define-key encoded-kbd-mode-map
+             (define-key key-translation-map
                (vector from) 'encoded-kbd-self-insert-ccl))
-         (setq from (1+ from))))))
+         (setq from (1+ from))))
+      8))
 
    (t
-    (error "Invalid value in encoded-kbd-coding: %s" encoded-kbd-coding))))
+    nil)))
 
+;; key-translation-map at the time Encoded-kbd mode is turned on is
+;; saved here.
+(defvar saved-key-translation-map nil)
 
 ;; Input mode at the time Encoded-kbd mode is turned on is saved here.
 (defvar saved-input-mode nil)
@@ -301,60 +272,38 @@ In Encoded-kbd mode, a text sent from keyboard is accepted
 as a multilingual text encoded in a coding system set by
 \\[set-keyboard-coding-system]."
   :global t
-  ;; We must at first reset input-mode to the original.
-  (if saved-input-mode (apply 'set-input-mode saved-input-mode))
+
   (if encoded-kbd-mode
-      (let ((coding (keyboard-coding-system)))
-       (setq saved-input-mode  (current-input-mode))
-       (cond ((null coding)
-              (setq encoded-kbd-mode nil)
-              (error "No coding system for keyboard input is set"))
-
-             ((= (coding-system-type coding) 1) ; SJIS
-              (set-input-mode
-               (nth 0 saved-input-mode) (nth 1 saved-input-mode)
-               'use-8th-bit (nth 3 saved-input-mode))
-              (setq encoded-kbd-coding 'sjis))
-
-             ((= (coding-system-type coding) 2) ; ISO2022
-              (if (aref (coding-system-flags coding) 7) ; 7-bit only
-                  (setq encoded-kbd-coding 'iso2022-7)
-                (set-input-mode
-                 (nth 0 saved-input-mode) (nth 1 saved-input-mode)
-                 'use-8th-bit (nth 3 saved-input-mode))
-                (setq encoded-kbd-coding 'iso2022-8))
-              (setq encoded-kbd-iso2022-designations (make-vector 4 nil))
-              (let ((flags (coding-system-flags coding))
-                    (i 0))
-                (while (< i 4)
-                  (if (charsetp (aref flags i))
-                      (aset encoded-kbd-iso2022-designations i
-                            (aref flags i))
-                    (if (charsetp (car-safe (aref flags i)))
-                      (aset encoded-kbd-iso2022-designations i
-                            (car (aref flags i)))))
-                  (setq i (1+ i))))
-              (setq encoded-kbd-iso2022-invocations (make-vector 3 nil))
-              (aset encoded-kbd-iso2022-invocations 0 0)
-              (aset encoded-kbd-iso2022-invocations 1 1))
-
-             ((= (coding-system-type coding) 3) ; BIG5
-              (set-input-mode
-               (nth 0 saved-input-mode) (nth 1 saved-input-mode)
-               'use-8th-bit (nth 3 saved-input-mode))
-              (setq encoded-kbd-coding 'big5))
-
-             ((= (coding-system-type coding) 4) ; CCL based coding
-              (set-input-mode
-               (nth 0 saved-input-mode) (nth 1 saved-input-mode)
-               'use-8th-bit (nth 3 saved-input-mode))
-              (setq encoded-kbd-coding 'ccl))
-
-             (t
-              (setq encoded-kbd-mode nil)
-              (error "Coding-system `%s' is not supported in Encoded-kbd mode"
-                     (keyboard-coding-system))))
-       (encoded-kbd-setup-keymap coding))))
+      ;; We are turning on Encoded-kbd mode.
+      (let ((coding (keyboard-coding-system))
+           result)
+       (or saved-key-translation-map
+           (if (keymapp key-translation-map)
+               (setq saved-key-translation-map
+                     (copy-keymap key-translation-map))
+             (setq key-translation-map (make-sparse-keymap))))
+       (or saved-input-mode
+           (setq saved-input-mode
+                 (current-input-mode)))
+       (setq result (and coding (encoded-kbd-setup-keymap coding)))
+       (if result
+           (if (eq result 8)
+               (set-input-mode
+                (nth 0 saved-input-mode) 
+                (nth 1 saved-input-mode)
+                'use-8th-bit
+                (nth 3 saved-input-mode)))
+         (setq encoded-kbd-mode nil
+               saved-key-translation-map nil
+               saved-input-mode nil)
+         (error "Unsupported coding system in Encoded-kbd mode: %S"
+                coding)))
+
+    ;; We are turning off Encoded-kbd mode.
+    (setq key-translation-map saved-key-translation-map
+         saved-key-translation-map nil)
+    (apply 'set-input-mode saved-input-mode)
+    (setq saved-input-mode nil)))
 
 (provide 'encoded-kb)