quail/japanese.el (quail-japanese-update-translation): Fix handling of invalid key.

diff --cc leim/ChangeLog
index dd33ae5a32f74ecda57926118673d5d9bca433c7,dd33ae5a32f74ecda57926118673d5d9bca433c7..9c5b2374b1fb9fe852e036dd1933246ed7d1e42e
--- 1/leim/ChangeLog
--- 2/leim/ChangeLog
+++ b/leim/ChangeLog
@@@ -1,3 -1,3 +1,8 @@@
++2010-08-28  Kenichi Handa  <handa@m17n.org>
++
++      * quail/japanese.el (quail-japanese-update-translation): Fix
++      handling of invalid key.
++
  2010-08-15  Andreas Schwab  <schwab@linux-m68k.org>
  
        * quail/vntelex.el ("vietnamese-telex"): Doc fix.

diff --cc leim/quail/japanese.el
index e1f7e74e0306e6d3f2b93827e40e0458dca65abe,e1f7e74e0306e6d3f2b93827e40e0458dca65abe..42d83c6b8063dfc2ea3bcdeb99aca32c9683742e
--- 1/leim/quail/japanese.el
--- 2/leim/quail/japanese.el
+++ b/leim/quail/japanese.el
@@@ -43,20 -43,20 +43,25 @@@
                (or quail-current-str quail-current-key)
              ""))
      (if (integerp control-flag)
--      (if (= control-flag 0)
--          (setq quail-current-str (aref quail-current-key 0))
--        (cond ((= (aref quail-current-key 0) ?n)
++      (let ((keylen (length quail-current-key)))
++        (cond ((= control-flag 0)
++               (setq quail-current-str (aref quail-current-key 0)
++                     control-flag t))
++              ((= (aref quail-current-key 0) ?n)
                 (setq quail-current-str ?\e$B$s\e(B)
                 (if (and quail-japanese-use-double-n
++                        (> keylen 0)
                          (= (aref quail-current-key 1) ?n))
                     (setq control-flag t)))
--              ((= (aref quail-current-key 0) (aref quail-current-key 1))
++              ((and (> keylen 1)
++                    (= (aref quail-current-key 0) (aref quail-current-key 1)))
                 (setq quail-current-str ?\e$B$C\e(B))
                (t
                 (setq quail-current-str (aref quail-current-key 0))))
          (if (integerp control-flag)
              (setq unread-command-events
--                  (list (aref quail-current-key control-flag)))))))
++                  (string-to-list
++                   (substring quail-current-key control-flag)))))))
    control-flag)
  
  ;; Convert Hiragana <-> Katakana in the current translation region.