Revision: 6662 Author: ek.kato Date: Tue Aug 3 05:49:38 2010 Log: * Merge r6658:6661 from trunk.
http://code.google.com/p/uim/source/detail?r=6662 Modified: /branches/1.6 /branches/1.6/NEWS /branches/1.6/scm/skk-custom.scm /branches/1.6/uim/skk.c ======================================= --- /branches/1.6/NEWS Mon Aug 2 23:52:38 2010 +++ /branches/1.6/NEWS Tue Aug 3 05:49:38 2010 @@ -1,5 +1,5 @@ Overview of changes from 1.6.0-alpha to 1.6.0-beta -============================================= +================================================== * Fixes - Generic IM * Fix crash in some cases when generic-show-prediction-candidates? ======================================= --- /branches/1.6/scm/skk-custom.scm Tue Jul 20 01:20:45 2010 +++ /branches/1.6/scm/skk-custom.scm Tue Aug 3 05:49:38 2010 @@ -467,6 +467,12 @@ (N_ "Use UNIX look command for completion") (N_ "long description will be here.")) +(custom-add-hook 'skk-use-look? + 'custom-set-hooks + (lambda () + (if skk-use-look? + (skk-lib-look-open skk-look-dict)))) + (define-custom 'skk-look-dict "/usr/share/dict/words" '(skk-advanced) '(pathname regular-file) ======================================= --- /branches/1.6/uim/skk.c Sun Apr 4 20:35:54 2010 +++ /branches/1.6/uim/skk.c Tue Aug 3 05:49:38 2010 @@ -3371,6 +3371,7 @@ if ((skk_look_ctx = uim_look_init()) == NULL) { use_look = 0; uim_fatal_error("uim_look_init() failed"); + return uim_scm_f(); } if (!uim_look_open_dict(fn, skk_look_ctx)) {
