1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00

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

This commit is contained in:
Kenichi Handa 2010-08-28 15:03:00 +09:00
commit f2b38ae6dd
2 changed files with 15 additions and 5 deletions

View File

@ -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.

View File

@ -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 ?$B$s(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 ?$B$C(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.