Revision: 6672 Author: ek.kato Date: Wed Aug 4 08:30:24 2010 Log: * Merge r6669:6671 from trunk.
http://code.google.com/p/uim/source/detail?r=6672 Modified: /branches/1.6 /branches/1.6/NEWS /branches/1.6/scm/ct.scm /branches/1.6/scm/look.scm ======================================= --- /branches/1.6/NEWS Wed Aug 4 02:01:15 2010 +++ /branches/1.6/NEWS Wed Aug 4 08:30:24 2010 @@ -5,9 +5,6 @@ * Fix crash in some cases when generic-show-prediction-candidates? is #f - - uim-toolbar-{gtk,gtk-systray,applet} - * Fix freezing toolbar when tool buttons are clicked - - uim-prime - uim-annotation-filter * Fix crash when command is not found @@ -17,6 +14,12 @@ * Show correct auto help sequences when tutcode-rule-userconfig is used + - uim-look + * Fix crash when dictionary file is not found + + - uim-toolbar-{gtk,gtk-systray,applet} + * Fix freezing toolbar when tool buttons are clicked + - uim-pref-qt4 * Fix compilation error due to the wrong version of uic is used in some environments ======================================= --- /branches/1.6/scm/ct.scm Sun Jun 13 18:21:49 2010 +++ /branches/1.6/scm/ct.scm Wed Aug 4 08:30:24 2010 @@ -49,6 +49,7 @@ (string-append (sys-pkgdatadir) "/tables/" table) (apply string-append seq)))) (if (and + looked (not (null? looked)) (= (string-contains (car looked) " " 0) 0)) (list (list seq) (read-from-string (car looked))) @@ -64,7 +65,9 @@ 2 (string-append (sys-pkgdatadir) "/tables/" table) (apply string-append seq)))) - (if (not (null? looked)) + (if (and + looked + (not (null? looked))) (let ((first (car looked)) (second (if (null? (cdr looked)) '() @@ -120,7 +123,9 @@ 5000 ;; is it sufficient enough? (string-append (sys-pkgdatadir) "/tables/" table) (apply string-append seq)))) - (if (not (null? looked)) + (if (and + looked + (not (null? looked))) (let* ((min-partial-pos (lambda (lst) (let ((maxlen (apply max (map string-length lst)))) ======================================= --- /branches/1.6/scm/look.scm Mon Jun 21 03:53:12 2010 +++ /branches/1.6/scm/look.scm Wed Aug 4 08:30:24 2010 @@ -387,7 +387,7 @@ (let* ((learned (look-search-learned lc str)) (looked (look-lib-look #t #t look-candidates-max look-dict str))) (look-context-set-dictlen! lc (length learned)) - (append learned looked))) + (append learned (if looked looked '())))) (define (look-update lc) (let ((str (look-context-left lc)))
