1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00

(quail-japanese-kanji-kkc): Adjusted for the change of quail.el.

(quail-japanese-switch-package): Likewise.
This commit is contained in:
Kenichi Handa 1998-07-16 00:14:44 +00:00
parent 9045dc7e0a
commit b528110c6c

View File

@ -72,18 +72,9 @@
(to (overlay-end quail-conv-overlay))
newfrom)
(quail-delete-overlays)
(setq overriding-terminal-local-map nil)
(kkc-region from to 'quail-japanese-kkc-mode-exit)))
;; Function to call on exiting KKC mode. ARG is nil if KKC mode is
;; exited normally, else ARG is a cons (FROM . TO) where FROM and TO
;; specify a region not yet processed.
(defun quail-japanese-kkc-mode-exit (arg)
(if arg
(progn
(setq overriding-terminal-local-map (quail-conversion-keymap))
(move-overlay quail-conv-overlay (car arg) (cdr arg)))
(run-hooks 'input-method-after-insert-chunk-hook)))
(let ((result (kkc-region from to)))
(move-overlay quail-conv-overlay (- (point) result) (point)))
(setq quail-converting nil)))
(defun quail-japanese-self-insert-and-switch-to-alpha (key idx)
(quail-delete-region)
@ -103,9 +94,7 @@
(defun quail-japanese-switch-package (key idx)
(let ((pkg (cdr (assq (aref key (1- idx)) quail-japanese-switch-table))))
(if (null pkg)
(error "No package to be switched")
(setq overriding-terminal-local-map nil)
(quail-delete-region)
(quail-error "No package to be switched")
(if (stringp pkg)
(activate-input-method pkg)
(if (string= (car pkg) current-input-method)