Revision: 5996 Author: sasugaanija Date: Sun Aug 30 05:16:52 2009 Log: * emacs/uim.el * emacs/uim-var.el * emacs/uim-candidate.el - Fix bug: uim.el doesn't work when linum-mode is activated and the inline candidates displaying mode is enabled (see uim-en 245)
http://code.google.com/p/uim/source/detail?r=5996 Modified: /trunk/emacs/uim-candidate.el /trunk/emacs/uim-var.el /trunk/emacs/uim.el ======================================= --- /trunk/emacs/uim-candidate.el Tue Jan 20 18:11:15 2009 +++ /trunk/emacs/uim-candidate.el Sun Aug 30 05:16:52 2009 @@ -303,6 +303,7 @@ (make-string page-space 32)) page-current "/" page-total " ")) cands-tmp + (uim-candidate-in-echo-region t) ) (setq cand (cdr cand)) ======================================= --- /trunk/emacs/uim-var.el Tue Jan 20 18:11:15 2009 +++ /trunk/emacs/uim-var.el Sun Aug 30 05:16:52 2009 @@ -389,6 +389,8 @@ (uim-deflocalvar uim-candidate-cursor nil) +(uim-deflocalvar uim-candidate-in-echo-region nil) + (uim-deflocalvar uim-show-candidate-upward nil) ======================================= --- /trunk/emacs/uim.el Tue Jan 20 18:11:15 2009 +++ /trunk/emacs/uim.el Sun Aug 30 05:16:52 2009 @@ -618,7 +618,8 @@ (defun uim-window-changed () (let (candidate-displayed) - (when (and uim-candidate-displayed + (when (and (not uim-candidate-in-echo-region) + uim-candidate-displayed uim-candidate-display-inline) (setq candidate-displayed uim-candidate-displayed)
