Revision: 6633
Author: ek.kato
Date: Fri Jul 30 00:01:09 2010
Log: * Merge r6632 from trunk.

http://code.google.com/p/uim/source/detail?r=6633

Modified:
 /branches/1.6/scm/generic.scm

=======================================
--- /branches/1.6/scm/generic.scm       Wed Jun 16 00:26:37 2010
+++ /branches/1.6/scm/generic.scm       Fri Jul 30 00:01:09 2010
@@ -332,7 +332,9 @@
               (begin
                 (im-activate-candidate-selector
                   pc (length cands/keys) generic-nr-candidate-max)
-                (if (not (string=? (cdr (car cands/keys)) ""))
+                (if (and
+                      generic-show-prediction-candidates?
+                      (not (string=? (cdr (car cands/keys)) "")))
                   (generic-context-set-rk-nth! pc -1)
                   (begin
                     (generic-context-set-rk-nth! pc 0)
@@ -474,7 +476,9 @@
             (begin
               (im-activate-candidate-selector
                 pc (length cands/nexts) generic-nr-candidate-max)
-              (if (not (string=? (cdr (car cands/nexts)) ""))
+              (if (and
+                    generic-show-prediction-candidates?
+                    (not (string=? (cdr (car cands/nexts)) "")))
                 (generic-context-set-rk-nth! pc -1)
                 (begin
                   (generic-context-set-rk-nth! pc 0)

Reply via email to