[uim-commit] r1315 - branches/r5rs/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-08-25 11:33:54 -0700 (Thu, 25 Aug 2005)
New Revision: 1315

Modified:
   branches/r5rs/scm/anthy.scm
   branches/r5rs/scm/canna.scm
   branches/r5rs/scm/skk.scm
Log:
* scm/anthy.scm : Merge changes in r1314 and r1304.
* scm/skk.scm : Merge changes in r1304.
* scm/canna.scm : Ditto.


Modified: branches/r5rs/scm/anthy.scm
===================================================================
--- branches/r5rs/scm/anthy.scm	2005-08-25 18:30:27 UTC (rev 1314)
+++ branches/r5rs/scm/anthy.scm	2005-08-25 18:33:54 UTC (rev 1315)
@@ -473,8 +473,8 @@
 				   res)
 		(ustr-insert-elem! (anthy-context-raw-ustr ac)
 				   key-str))
-	      (if (not (rk-pending rkc)
-                  (anthy-commit-raw ac))))))))))
+	      (if (not (rk-pending rkc))
+                  (anthy-commit-raw ac)))))))))
 
 (define anthy-has-preedit?
   (lambda (ac)
@@ -735,7 +735,7 @@
        (and (not (ustr-cursor-at-beginning? preconv-str))
 	    (cons preedit-underline
 		  (string-append-map-ustr-former extract-kana preconv-str)))
-       (and (> (length pending) 0)
+       (and (> (string-length pending) 0)
 	    (cons preedit-underline pending))
        (and (anthy-has-preedit? ac)
 	    (cons preedit-cursor ""))
@@ -975,10 +975,7 @@
 (define anthy-reset-handler
   (lambda (ac)
     (if (anthy-context-on ac)
-        (begin
-          (anthy-flush ac)
-          (im-clear-preedit ac)
-          (im-update-preedit ac)))
+	(anthy-flush ac))
     ;; code to commit pending string must not be added to here.
     ;; -- YamaKen 2004-10-21
     ))

Modified: branches/r5rs/scm/canna.scm
===================================================================
--- branches/r5rs/scm/canna.scm	2005-08-25 18:30:27 UTC (rev 1314)
+++ branches/r5rs/scm/canna.scm	2005-08-25 18:33:54 UTC (rev 1315)
@@ -877,8 +877,6 @@
   (if (canna-context-on cc)
       (begin
         (canna-flush cc)
-        (im-clear-preedit cc)
-        (im-update-preedit cc)
         (if (canna-context-state cc)
           (let ((cc-id (canna-context-cc-id cc)))
             (canna-lib-reset-conversion cc-id))))))

Modified: branches/r5rs/scm/skk.scm
===================================================================
--- branches/r5rs/scm/skk.scm	2005-08-25 18:30:27 UTC (rev 1314)
+++ branches/r5rs/scm/skk.scm	2005-08-25 18:33:54 UTC (rev 1315)
@@ -1845,9 +1845,7 @@
 
 (define skk-reset-handler
   (lambda (sc)
-    (skk-flush sc)
-    (im-clear-preedit sc)
-    (im-update-preedit sc)))
+    (skk-flush sc)))
 
 (define skk-get-candidate-handler
   (lambda (sc idx accel-enum-hint)