[uim-commit] r2551 - branches/1.0/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-12 05:30:18 -0800 (Mon, 12 Dec 2005)
New Revision: 2551

Modified:
   branches/1.0/scm/skk.scm
Log:
* scm/skk.scm (skk-back-to-kanji-state) : Port r2550 from trunk.


Modified: branches/1.0/scm/skk.scm
===================================================================
--- branches/1.0/scm/skk.scm	2005-12-12 13:26:19 UTC (rev 2550)
+++ branches/1.0/scm/skk.scm	2005-12-12 13:30:18 UTC (rev 2551)
@@ -1714,18 +1714,24 @@
     (skk-context-set-state! sc 'skk-state-kanji)
     (skk-context-set-okuri-head! sc "")
     (if (not (null? (skk-context-okuri sc)))
-	(skk-context-set-head! sc
-			       (append (skk-context-okuri sc)
-				       (skk-context-head sc))))
+	(begin
+	  (skk-context-set-head! sc
+				 (append (skk-context-okuri sc)
+					 (skk-context-head sc)))
+	  (if skk-dcomp-activate?
+	      (skk-context-set-dcomp-word! sc ""))))
     (if (not (null? (skk-context-appendix sc)))
-	(skk-context-set-head! sc
-			       (append (skk-context-appendix sc)
-				       (skk-context-head sc))))
+	(begin
+	  (skk-context-set-head! sc
+				 (append (skk-context-appendix sc)
+					 (skk-context-head sc)))
+	  (if skk-dcomp-activate?
+	      (skk-context-set-dcomp-word! sc ""))))
     (skk-context-set-okuri! sc '())
     (skk-context-set-appendix! sc '())
     ;; don't clear dcomp (not compatible with ddskk's behavior)
     ;;(if skk-dcomp-activate?
-    ;;	(skk-context-set-dcomp-word! sc ""))
+    ;; (skk-context-set-dcomp-word! sc ""))
     (skk-context-set-nr-candidates! sc 0)))
 
 (define skk-back-to-converting-state