[uim] r7192 committed - Merge r7151 from trunk.

[codesite-noreply]

Revision: 7192
Author:   deton.kih
Date:     Fri Jul  8 16:31:05 2011
Log:      Merge r7151 from trunk.
http://code.google.com/p/uim/source/detail?r=7192
Modified:
 /branches/1.7/scm/tutcode.scm

=======================================
--- /branches/1.7/scm/tutcode.scm       Fri Jul  8 16:26:42 2011
+++ /branches/1.7/scm/tutcode.scm       Fri Jul  8 16:31:05 2011
@@ -2483,6 +2483,9 @@
            (rk-flush rkc)
            (tutcode-context-set-commit-strs! pc ())
            (tutcode-context-set-state! pc 'tutcode-state-off))
+          ((tutcode-on-key? key key-state) ; off-key¤Èon-key¤¬ÊÌ¥­¡¼¤Î¾ì¹ç
+           ;;  
¸½ºßon¤Ç¤âoff¤Ç¤â¡¢on-key¤Çon¤Ë¤·¤¿¤¤¤À¤±¤Ê¤Î¤Çcommit-raw¤ò²óÈò
+           (rk-flush rkc))
           ((tutcode-kigou-toggle-key? key key-state)
            (rk-flush rkc)
            (tutcode-begin-kigou-mode pc))
@@ -2984,9 +2987,13 @@
 ;;; @param key-state ¥³¥ó¥È¥í¡¼¥ë¥­¡¼Åù¤Î¾õÂÖ
 (define (tutcode-proc-state-off c key key-state)
   (let ((pc (tutcode-find-descendant-context c)))
-    (if (tutcode-on-key? key key-state)
-      (tutcode-context-set-state! pc 'tutcode-state-on)
-      (tutcode-commit-raw pc key key-state))))
+    (cond
+      ((tutcode-on-key? key key-state)
+        (tutcode-context-set-state! pc 'tutcode-state-on))
+      ((tutcode-off-key? key key-state) ; on-key¤Èoff-key¤¬ÊÌ¥­¡¼¤Î¾ì¹ç
+        ) ;  
¸½ºßon¤Ç¤âoff¤Ç¤â¡¢off-key¤Çoff¤Ë¤·¤¿¤¤¤À¤±¤Ê¤Î¤Çcommit-raw¤ò²óÈò
+      (else
+        (tutcode-commit-raw pc key key-state)))))

 ;;; µ­¹æÆþÎϥ⡼¥É»þ¤Î¥­¡¼ÆþÎϤò½èÍý¤¹¤ë¡£
 ;;; @param c ¥³¥ó¥Æ¥­¥¹¥È¥ê¥¹¥È