Revision: 6928 Author: deton.kih Date: Fri Jan 28 15:57:42 2011 Log: * Merge r6923,r6924 from trunk.
http://code.google.com/p/uim/source/detail?r=6928 Modified: /branches/1.6/scm/tutcode.scm /branches/1.6/uim/skk.c ======================================= --- /branches/1.6/scm/tutcode.scm Thu Jan 6 18:17:32 2011 +++ /branches/1.6/scm/tutcode.scm Fri Jan 28 15:57:42 2011 @@ -2598,11 +2598,13 @@ ;; ¿·¤¿¤ÊÆþÎÏʸ»ú¤ò²Ã¤¨¤¿¹çÀ®ÉÔǽ¢ª¿·¤¿¤ÊÆþÎÏʸ»ú¤òºï½ü ((null? res) (tutcode-context-set-head! pc (cdr (tutcode-context-head pc))) - (tutcode-context-set-candidate-window! pc - 'tutcode-candidate-window-interactive-bushu) - (im-activate-candidate-selector pc - (tutcode-context-prediction-nr-all pc) - (tutcode-context-prediction-page-limit pc))) + (if (> (tutcode-context-prediction-nr pc) 0) + (begin + (tutcode-context-set-candidate-window! pc + 'tutcode-candidate-window-interactive-bushu) + (im-activate-candidate-selector pc + (tutcode-context-prediction-nr-all pc) + (tutcode-context-prediction-page-limit pc))))) (else (let ((nr (length res))) (tutcode-context-set-prediction-word! pc ()) ======================================= --- /branches/1.6/uim/skk.c Thu Jan 6 18:17:32 2011 +++ /branches/1.6/uim/skk.c Fri Jan 28 15:57:42 2011 @@ -211,7 +211,7 @@ const char *b; /* find first white space */ b = strchr(line_str, ' '); - if (!b) + if (!b || b == line_str) return 0; /* check previous character */ b--;
