--- a/lisp/mule/canna.el	Mon Aug 13 09:12:43 2007 +0200
+++ b/lisp/mule/canna.el	Mon Aug 13 09:13:56 2007 +0200
@@ -381,7 +381,11 @@
   "Use input character as a key of complex translation input such as\n\
 kana-to-kanji translation."
   (interactive "*p")
-  (canna:functional-insert-command2 last-command-char arg) )
+  (let ((ch))
+    (if (char-or-char-int-p arg)
+	(setq ch last-command-char)
+      (setq ch (event-to-character last-command-event)))
+    (canna:functional-insert-command2 ch arg) ))
 
 (defun canna:functional-insert-command2 (ch arg)
   "This function actualy isert a converted Japanese string."
@@ -647,7 +651,11 @@
   (use-local-map canna:*minibuffer-local-map-backup*)
   (set-window-buffer (minibuffer-window) canna:*saved-minibuffer*)
   (select-window canna:*previous-window*)
-  (canna:functional-insert-command2 last-command-char arg) )
+  (let ((ch))
+    (if (char-or-char-int-p arg)
+	(setq ch last-command-char)
+      (setq ch (event-to-character last-command-event)))
+    (canna:functional-insert-command2 ch arg) ))
 
 ;;;
 ;;; $B$+$s$J%b!<%I$N<gLr$O!"<!$N(B canna-self-insert-command $B$G$"$k!#$3$N(B