[uim-commit] r364 - in trunk: scm uim

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-26 19:29:28 -0800 (Wed, 26 Jan 2005)
New Revision: 364

Modified:
   trunk/scm/skk.scm
   trunk/uim/skk-dic.c
Log:
* uim/skk-dic.c (reorder_candidate) : Set cache_modified flag.
* scm/skk.scm : Use char-upper-case? in util.scm instead of
  skk-upper-char?
(skk-upper-char?) : Removed.


Modified: trunk/scm/skk.scm
===================================================================
--- trunk/scm/skk.scm	2005-01-27 03:07:14 UTC (rev 363)
+++ trunk/scm/skk.scm	2005-01-27 03:29:28 UTC (rev 364)
@@ -935,7 +935,7 @@
 	     (skk-commit-raw-with-preedit-update sc key key-state)
 	     #f)
 	   #t)
-       (if (skk-upper-char? key)
+       (if (char-upper-case? key)
 	   (let* ((residual-kana (rk-push-key-last! rkc)))
 	     ;; handle preceding "n"
 	     (if residual-kana
@@ -982,12 +982,6 @@
 	      (skk-get-string sc res kana))
 	  #f))))
 
-(define skk-upper-char?
-  (lambda (c)
-    (and (integer? c)
-	 (or
-	  (and (>= c 65) (<= c 90))))))
-
 (define skk-sokuon-shiin-char?
   (lambda (c)
     (and (alphabet-char? c)
@@ -1093,7 +1087,7 @@
 	     (skk-begin-conversion sc)
 	     #f)
 	   #t)
-       (if (and (skk-upper-char? key)
+       (if (and (char-upper-case? key)
 		(not (null? (skk-context-head sc))))
 	   (begin
 	     (skk-context-set-state! sc 'skk-state-okuri)

Modified: trunk/uim/skk-dic.c
===================================================================
--- trunk/uim/skk-dic.c	2005-01-27 03:07:14 UTC (rev 363)
+++ trunk/uim/skk-dic.c	2005-01-27 03:29:28 UTC (rev 364)
@@ -1385,6 +1385,7 @@
   if (nth >= ca->nr_real_cands) {
     ca->nr_real_cands ++;
   }
+  skk_dic->cache_modified = 1;
 }
 
 static void