[uim-commit] r2658 - trunk/scm

[yamamoto at freedesktop.org]

Author: yamamoto
Date: 2005-12-19 11:09:41 -0800 (Mon, 19 Dec 2005)
New Revision: 2658

Modified:
   trunk/scm/anthy.scm
   trunk/scm/canna.scm
   trunk/scm/mana.scm
Log:
* If {anthy,mana}-use-with-vi? flag is set, undo don't work on gvim.
  commit-raw flag exists only for optimization.
  Removing commit-raw flag fix the bug.
  
* scm/anthy.scm
- (anthy-context-rec-spec) : Remove commit-raw.
- (anthy-commit-raw) : Ditto.
- (anthy-update-preedit) : Ditto.
- (anthy-proc-input-state-no-preedit) : Ditto.
* scm/mana.scm
- (mana-context-rec-spec) : Remove commit-raw.
- (mana-commit-raw) : Ditto.
- (mana-update-preedit) : Ditto.
- (mana-proc-input-state-no-preedit) : Ditto.
* scm/canna.scm
- (canna-context-rec-spec) : Remove commit-raw.
- (canna-commit-raw) : Ditto.



Modified: trunk/scm/anthy.scm
===================================================================
--- trunk/scm/anthy.scm	2005-12-19 13:41:20 UTC (rev 2657)
+++ trunk/scm/anthy.scm	2005-12-19 19:09:41 UTC (rev 2658)
@@ -228,7 +228,6 @@
     (list 'candidate-op-count 0)
     (list 'wide-latin         #f)
     (list 'kana-mode          anthy-type-hiragana)
-    (list 'commit-raw         #t)
     (list 'input-rule         anthy-input-rule-roma)
     (list 'raw-ustr           #f))))
 (define-record 'anthy-context anthy-context-rec-spec)
@@ -260,8 +259,7 @@
 
 (define anthy-commit-raw
   (lambda (ac)
-    (im-commit-raw ac)
-    (anthy-context-set-commit-raw! ac #t)))
+    (im-commit-raw ac)))
 
 (define anthy-context-kana-toggle
   (lambda (ac)
@@ -372,16 +370,14 @@
 
 (define anthy-update-preedit
   (lambda (ac)
-    (if (not (anthy-context-commit-raw ac))
-	(let ((segments (if (anthy-context-on ac)
-			    (if (anthy-context-transposing ac)
-				(anthy-context-transposing-state-preedit ac)
-				(if (anthy-context-converting ac)
-				    (anthy-converting-state-preedit ac)
-				    (anthy-input-state-preedit ac)))
-			    ())))
-	  (context-update-preedit ac segments))
-	(anthy-context-set-commit-raw! ac #f))))
+    (let ((segments (if (anthy-context-on ac)
+                        (if (anthy-context-transposing ac)
+                            (anthy-context-transposing-state-preedit ac)
+                            (if (anthy-context-converting ac)
+                                (anthy-converting-state-preedit ac)
+                                (anthy-input-state-preedit ac)))
+                        ())))
+      (context-update-preedit ac segments))))
   
 (define anthy-proc-raw-state
   (lambda (ac key key-state)
@@ -513,8 +509,7 @@
 	(if (not (anthy-commit-key? key key-state))
 	    (begin 
 	      (anthy-context-set-transposing! ac #f)
-	      (anthy-proc-input-state ac key key-state)
-              (anthy-context-set-commit-raw! ac #f))))))))
+	      (anthy-proc-input-state ac key key-state))))))))
 
 (define anthy-proc-input-state-with-preedit
   (lambda (ac key key-state)

Modified: trunk/scm/canna.scm
===================================================================
--- trunk/scm/canna.scm	2005-12-19 13:41:20 UTC (rev 2657)
+++ trunk/scm/canna.scm	2005-12-19 19:09:41 UTC (rev 2658)
@@ -208,7 +208,6 @@
     (list 'candidate-op-count ())
     (list 'wide-latin         #f)
     (list 'kana-mode          multi-segment-type-hiragana)
-    (list 'commit-raw         #t)
     (list 'input-rule         canna-input-rule-roma))))
 (define-record 'canna-context canna-context-rec-spec)
 (define canna-context-new-internal canna-context-new)
@@ -227,8 +226,7 @@
     cc))
 
 (define (canna-commit-raw cc)
-  (im-commit-raw cc)
-  (canna-context-set-commit-raw! cc #t))
+  (im-commit-raw cc))
 
 (define canna-opposite-kana
   (lambda (kana)

Modified: trunk/scm/mana.scm
===================================================================
--- trunk/scm/mana.scm	2005-12-19 13:41:20 UTC (rev 2657)
+++ trunk/scm/mana.scm	2005-12-19 19:09:41 UTC (rev 2658)
@@ -380,7 +380,6 @@
       (list 'candidate-op-count 0)
       (list 'wide-latin         #f)
       (list 'kana-mode          mana-type-hiragana)
-      (list 'commit-raw         #t)
       (list 'input-rule         mana-input-rule-roma)
       (list 'raw-ustr           #f))))
 (define-record 'mana-context mana-context-rec-spec)
@@ -410,8 +409,7 @@
 
 (define mana-commit-raw
   (lambda (mc)
-    (im-commit-raw mc)
-    (mana-context-set-commit-raw! mc #t)))
+    (im-commit-raw mc)))
 
 (define mana-context-kana-toggle
   (lambda (mc)
@@ -524,16 +522,14 @@
 
 (define mana-update-preedit
   (lambda (mc)
-    (if (not (mana-context-commit-raw mc))
-        (let ((segments (if (mana-context-on mc)
-                            (if (mana-context-transposing mc)
-                                (mana-context-transposing-state-preedit mc)
-                                (if (mana-context-converting mc)
-                                    (mana-converting-state-preedit mc)
-                                    (mana-input-state-preedit mc)))
-                            ())))
-          (context-update-preedit mc segments))
-        (mana-context-set-commit-raw! mc #f))))
+    (let ((segments (if (mana-context-on mc)
+                        (if (mana-context-transposing mc)
+                            (mana-context-transposing-state-preedit mc)
+                            (if (mana-context-converting mc)
+                                (mana-converting-state-preedit mc)
+                                (mana-input-state-preedit mc)))
+                        ())))
+      (context-update-preedit mc segments))))
 
 (define mana-proc-raw-state
   (lambda (mc key key-state)
@@ -669,8 +665,7 @@
           (if (not (mana-commit-key? key key-state))
               (begin 
                 (mana-context-set-transposing! mc #f)
-                (mana-proc-input-state mc key key-state)
-                (mana-context-set-commit-raw! mc #f))))))))
+                (mana-proc-input-state mc key key-state))))))))
 
 (define mana-proc-input-state-with-preedit
   (lambda (mc key key-state)