Hiroyuki Komatsu
komat****@users*****
2004年 12月 11日 (土) 16:53:45 JST
Index: prime-el/src/prime-input-mode.el diff -u prime-el/src/prime-input-mode.el:1.11 prime-el/src/prime-input-mode.el:1.12 --- prime-el/src/prime-input-mode.el:1.11 Thu Dec 9 15:42:35 2004 +++ prime-el/src/prime-input-mode.el Sat Dec 11 16:53:45 2004 @@ -1,4 +1,4 @@ -;; $Id: prime-input-mode.el,v 1.11 2004/12/09 06:42:35 komatsu Exp $ +;; $Id: prime-input-mode.el,v 1.12 2004/12/11 07:53:45 komatsu Exp $ ;; undo 機構を自前で用意しているので, そのへんを注意. (defun prime-input-mode (&optional arg) @@ -133,12 +133,18 @@ ;; ;; Mode operations ;; +(defun prime-input-set-mode-internal (mode) + "This is an internal funcion for prime-input-set-mode" + (and prime-conv-mode + (prime-conv-cancel)) + (prime-server-edit-set-mode (prime-input-get-session-id) mode) + (or prime-fund-mode + (prime-input-refresh))) + (defun prime-input-set-mode-default () "PRIME の通常の入力モードに変更します。 [F6]" (interactive) - (prime-server-edit-set-mode (prime-input-get-session-id) "default") - (or prime-fund-mode - (prime-input-refresh))) + (prime-input-set-mode-internal "default")) (defun prime-input-set-mode-hiragana () "PRIME の通常の入力モードに変更します。 [F6]" @@ -148,30 +154,22 @@ (defun prime-input-set-mode-katakana () "PRIME のカタカナ入力モードに変更します。[F7]" (interactive) - (prime-server-edit-set-mode (prime-input-get-session-id) "katakana") - (or prime-fund-mode - (prime-input-refresh))) + (prime-input-set-mode-internal "katakana")) (defun prime-input-set-mode-halfkatakana () "PRIME の半角カタカナ入力モードに変更します。[F8]" (interactive) - (prime-server-edit-set-mode (prime-input-get-session-id) "half_katakana") - (or prime-fund-mode - (prime-input-refresh))) + (prime-input-set-mode-internal "half_katakana")) (defun prime-input-set-mode-wideascii () "PRIME の全角英数字入力モードに変更します。[F9]" (interactive) - (prime-server-edit-set-mode (prime-input-get-session-id) "wide_ascii") - (or prime-fund-mode - (prime-input-refresh))) + (prime-input-set-mode-internal "wide_ascii")) (defun prime-input-set-mode-ascii () "PRIME の英数字入力モードに変更します。[F10]" (interactive) - (prime-server-edit-set-mode (prime-input-get-session-id) "raw") - (or prime-fund-mode - (prime-input-refresh))) + (prime-input-set-mode-internal "raw")) (defun prime-input-refresh () Index: prime-el/src/prime-init.el diff -u prime-el/src/prime-init.el:1.14 prime-el/src/prime-init.el:1.15 --- prime-el/src/prime-init.el:1.14 Thu Dec 9 15:42:35 2004 +++ prime-el/src/prime-init.el Sat Dec 11 16:53:45 2004 @@ -1,5 +1,5 @@ ;;;; prime-init.el: initialize prime-el -;;;; $Id: prime-init.el,v 1.14 2004/12/09 06:42:35 komatsu Exp $ +;;;; $Id: prime-init.el,v 1.15 2004/12/11 07:53:45 komatsu Exp $ ;;;; ;;;; Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****> ;;;; All rights reserved. @@ -23,14 +23,12 @@ (require 'prime-enum-mode) (require 'prime-socialite) (require 'prime-log) -;(require 'prime-suikyo) (defun prime-init (&optional forcep) (prime-init-load-file) (prime-keymap-init forcep) (prime-mode-init forcep) (prime-server-init forcep) -; (prime-suikyo-init forcep) (prime-style-init prime-style) (run-hooks 'prime-init-hook) Index: prime-el/src/prime-conv-mode.el diff -u prime-el/src/prime-conv-mode.el:1.8 prime-el/src/prime-conv-mode.el:1.9 --- prime-el/src/prime-conv-mode.el:1.8 Tue Dec 7 21:29:04 2004 +++ prime-el/src/prime-conv-mode.el Sat Dec 11 16:53:45 2004 @@ -1,4 +1,4 @@ -;; $Id: prime-conv-mode.el,v 1.8 2004/12/07 12:29:04 komatsu Exp $ +;; $Id: prime-conv-mode.el,v 1.9 2004/12/11 07:53:45 komatsu Exp $ (defun prime-conv-mode (&optional arg) (setq prime-conv-mode @@ -59,6 +59,7 @@ (setq prime-nth-cand (1+ prime-nth-cand)) (prime-disp-conv)) ) + ;; = prime-input-mode (prime-conv-mode-on) (setq prime-nth-cand 0) @@ -88,7 +89,8 @@ (interactive) (if prime-conv-mode (prime-conv-mode (prime-fix prime-curstr)) - (if prime-context ;; prime-input-mode + ;; prime-input-mode + (if prime-context (prime-fix (prime-input-get-inserting-label)) (prime-fix-without-learn (prime-input-get-inserting-label)))) (prime-after-fix))
