[uim-commit] r274 - trunk/scm

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-13 01:29:13 -0800 (Thu, 13 Jan 2005)
New Revision: 274

Modified:
   trunk/scm/skk.scm
Log:
* scm/skk.scm (skk-proc-state-direct) : Generalization of
  skk-plain-space-key? case.


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-01-13 03:10:18 UTC (rev 273)
+++ trunk/scm/skk.scm	2005-01-13 09:29:13 UTC (rev 274)
@@ -910,14 +910,14 @@
        ;; behavior.
        ;; 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)
 	   (begin
-	     (set! res (rk-push-key! rkc key-str))
-	     ;; For special exception, don't commit native space if
-	     ;; this key sequcence produce zenkaku space.
-	     (if (not (and res
-			   (string=? (car res) "¡¡")))
-		 (skk-commit-raw-with-preedit-update sc key key-state))
+	     (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)))
 	     #f)
 	   #t)
        ;; bad strategy. see bug #528