[uim-commit] r279 - trunk/scm

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-13 19:24:06 -0800 (Thu, 13 Jan 2005)
New Revision: 279

Modified:
   trunk/scm/skk.scm
Log:
* scm/skk.scm (skk-proc-state-direct) : Simplify the changes in
  r274.


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-01-14 00:16:27 UTC (rev 278)
+++ trunk/scm/skk.scm	2005-01-14 03:24:06 UTC (rev 279)
@@ -911,13 +911,11 @@
        ;; 1. commits "n" as kana according to kana-mode
        ;; 2. commits " " as native space (such as Qt::Key_Space)
        ;;    unless expected rkc list includes " "
-       (if (skk-plain-space-key? key key-state)
+       (if (and (skk-plain-space-key? key key-state)
+		(not (string-find (rk-expect rkc) key-str)))
 	   (begin
-	     (if (string-find (rk-expect rkc) " ")
-		 (set! res (rk-push-key! rkc key-str))
-		 (begin
-		   (set! res (rk-push-key! rkc key-str))
-		   (skk-commit-raw-with-preedit-update sc key key-state)))
+	     (set! res (rk-push-key-last! rkc))
+	     (skk-commit-raw-with-preedit-update sc key key-state)
 	     #f)
 	   #t)
        ;; bad strategy. see bug #528