[uim-commit] r2550 - trunk/scm

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-12 05:26:19 -0800 (Mon, 12 Dec 2005)
New Revision: 2550

Modified:
   trunk/scm/skk.scm
Log:
* scm/skk.scm (skk-back-to-kanji-state) : Second try to fix
  [Anthy-dev 2689].


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-12-12 13:03:16 UTC (rev 2549)
+++ trunk/scm/skk.scm	2005-12-12 13:26:19 UTC (rev 2550)
@@ -1714,23 +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-lib-get-dcomp-word
-	  (skk-make-string
-	   (skk-context-head sc) (skk-context-kana-mode sc))
-	  skk-use-numeric-conversion?)))
+    ;;(if skk-dcomp-activate?
+    ;; (skk-context-set-dcomp-word! sc ""))
     (skk-context-set-nr-candidates! sc 0)))
 
 (define skk-back-to-converting-state