Revision: 6089 Author: ek.kato Date: Sun Nov 22 03:43:02 2009 Log: * Merge r5995:5997 from trunk.
http://code.google.com/p/uim/source/detail?r=6089 Modified: /branches/1.5/emacs/uim-candidate.el /branches/1.5/emacs/uim-key.el /branches/1.5/emacs/uim-var.el /branches/1.5/emacs/uim.el ======================================= --- /branches/1.5/emacs/uim-candidate.el Tue Jan 20 18:16:35 2009 +++ /branches/1.5/emacs/uim-candidate.el Sun Nov 22 03:43:02 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)) ======================================= --- /branches/1.5/emacs/uim-key.el Tue Jan 20 18:16:35 2009 +++ /branches/1.5/emacs/uim-key.el Sun Nov 22 03:43:02 2009 @@ -612,8 +612,15 @@ ;;(setq translated-vector input-vector) (setq translated-vector nil) (throw 'fmap-loop t)) - - (setq translated (lookup-key function-key-map input-vector-main)) + + (if (boundp 'input-decode-map) + (setq translated (lookup-key input-decode-map + input-vector-main))) + + (if (or (not translated) + (integerp translated)) + (setq translated (lookup-key function-key-map + input-vector-main))) (if (and (or (not translated) (integerp translated)) ======================================= --- /branches/1.5/emacs/uim-var.el Tue Jan 20 18:16:35 2009 +++ /branches/1.5/emacs/uim-var.el Sun Nov 22 03:43:02 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) ======================================= --- /branches/1.5/emacs/uim.el Tue Jan 20 18:16:35 2009 +++ /branches/1.5/emacs/uim.el Sun Nov 22 03:43:02 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)
