comparison lisp/mule/canna.el @ 98:0d2f883870bc r20-1b1

Import from CVS: tag r20-1b1
author cvs
date Mon, 13 Aug 2007 09:13:56 +0200
parents 131b0175ea99
children 9f59509498e1
comparison
equal deleted inserted replaced
97:498bf5da1c90 98:0d2f883870bc
379 379
380 (defun canna-functional-insert-command (arg) 380 (defun canna-functional-insert-command (arg)
381 "Use input character as a key of complex translation input such as\n\ 381 "Use input character as a key of complex translation input such as\n\
382 kana-to-kanji translation." 382 kana-to-kanji translation."
383 (interactive "*p") 383 (interactive "*p")
384 (canna:functional-insert-command2 last-command-char arg) ) 384 (let ((ch))
385 (if (char-or-char-int-p arg)
386 (setq ch last-command-char)
387 (setq ch (event-to-character last-command-event)))
388 (canna:functional-insert-command2 ch arg) ))
385 389
386 (defun canna:functional-insert-command2 (ch arg) 390 (defun canna:functional-insert-command2 (ch arg)
387 "This function actualy isert a converted Japanese string." 391 "This function actualy isert a converted Japanese string."
388 ;; $B$3$N4X?t$OM?$($i$l$?J8;z$rF|K\8lF~NO$N$?$a$N%-!<F~NO$H$7$F<h$j07(B 392 ;; $B$3$N4X?t$OM?$($i$l$?J8;z$rF|K\8lF~NO$N$?$a$N%-!<F~NO$H$7$F<h$j07(B
389 ;; $B$$!"F|K\8lF~NO$NCf4V7k2L$r4^$a$?=hM}$r(BEmacs$B$N%P%C%U%!$KH?1G$5$;$k(B 393 ;; $B$$!"F|K\8lF~NO$NCf4V7k2L$r4^$a$?=hM}$r(BEmacs$B$N%P%C%U%!$KH?1G$5$;$k(B
645 kana-to-kanji translation, even if you are in the minibuffer." 649 kana-to-kanji translation, even if you are in the minibuffer."
646 (interactive "p") 650 (interactive "p")
647 (use-local-map canna:*minibuffer-local-map-backup*) 651 (use-local-map canna:*minibuffer-local-map-backup*)
648 (set-window-buffer (minibuffer-window) canna:*saved-minibuffer*) 652 (set-window-buffer (minibuffer-window) canna:*saved-minibuffer*)
649 (select-window canna:*previous-window*) 653 (select-window canna:*previous-window*)
650 (canna:functional-insert-command2 last-command-char arg) ) 654 (let ((ch))
655 (if (char-or-char-int-p arg)
656 (setq ch last-command-char)
657 (setq ch (event-to-character last-command-event)))
658 (canna:functional-insert-command2 ch arg) ))
651 659
652 ;;; 660 ;;;
653 ;;; $B$+$s$J%b!<%I$N<gLr$O!"<!$N(B canna-self-insert-command $B$G$"$k!#$3$N(B 661 ;;; $B$+$s$J%b!<%I$N<gLr$O!"<!$N(B canna-self-insert-command $B$G$"$k!#$3$N(B
654 ;;; $B%3%^%s%I$OA4$F$N%0%i%U%#%C%/%-!<$K%P%$%s%I$5$l$k!#(B 662 ;;; $B%3%^%s%I$OA4$F$N%0%i%U%#%C%/%-!<$K%P%$%s%I$5$l$k!#(B
655 ;;; 663 ;;;