Hiroyuki Komatsu
komat****@users*****
2004年 12月 9日 (木) 15:42:35 JST
Index: prime-el/src/prime-main.el
diff -u prime-el/src/prime-main.el:1.12 prime-el/src/prime-main.el:1.13
--- prime-el/src/prime-main.el:1.12 Wed Dec 8 17:59:58 2004
+++ prime-el/src/prime-main.el Thu Dec 9 15:42:35 2004
@@ -331,7 +331,7 @@
(defun prime-disp-annotation (literal)
"This displays an annotation for the word LITERAL"
(let ((annotation (prime-server-get-word-data literal "annotation")))
- (if usage
+ (if annotation
(message annotation))
))
Index: prime-el/src/prime-input-mode.el
diff -u prime-el/src/prime-input-mode.el:1.10 prime-el/src/prime-input-mode.el:1.11
--- prime-el/src/prime-input-mode.el:1.10 Wed Dec 8 13:33:49 2004
+++ prime-el/src/prime-input-mode.el Thu Dec 9 15:42:35 2004
@@ -1,4 +1,4 @@
-;; $Id: prime-input-mode.el,v 1.10 2004/12/08 04:33:49 komatsu Exp $
+;; $Id: prime-input-mode.el,v 1.11 2004/12/09 06:42:35 komatsu Exp $
;; undo 機構を自前で用意しているので, そのへんを注意.
(defun prime-input-mode (&optional arg)
@@ -16,7 +16,6 @@
(prime-mode-on nil)
(prime-conv-mode-off)
(prime-fund-mode-off)
- (prime-input-set-mode-default)
(setq prime-input-mode t)
(setq prime-buffer-undo-list buffer-undo-list)
(buffer-disable-undo)
@@ -138,7 +137,8 @@
"PRIME の通常の入力モードに変更します。 [F6]"
(interactive)
(prime-server-edit-set-mode (prime-input-get-session-id) "default")
- (prime-input-refresh))
+ (or prime-fund-mode
+ (prime-input-refresh)))
(defun prime-input-set-mode-hiragana ()
"PRIME の通常の入力モードに変更します。 [F6]"
@@ -149,25 +149,29 @@
"PRIME のカタカナ入力モードに変更します。[F7]"
(interactive)
(prime-server-edit-set-mode (prime-input-get-session-id) "katakana")
- (prime-input-refresh))
+ (or prime-fund-mode
+ (prime-input-refresh)))
(defun prime-input-set-mode-halfkatakana ()
"PRIME の半角カタカナ入力モードに変更します。[F8]"
(interactive)
(prime-server-edit-set-mode (prime-input-get-session-id) "half_katakana")
- (prime-input-refresh))
+ (or prime-fund-mode
+ (prime-input-refresh)))
(defun prime-input-set-mode-wideascii ()
"PRIME の全角英数字入力モードに変更します。[F9]"
(interactive)
(prime-server-edit-set-mode (prime-input-get-session-id) "wide_ascii")
- (prime-input-refresh))
+ (or prime-fund-mode
+ (prime-input-refresh)))
(defun prime-input-set-mode-ascii ()
"PRIME の英数字入力モードに変更します。[F10]"
(interactive)
(prime-server-edit-set-mode (prime-input-get-session-id) "raw")
- (prime-input-refresh))
+ (or prime-fund-mode
+ (prime-input-refresh)))
(defun prime-input-refresh ()
Index: prime-el/src/prime-init.el
diff -u prime-el/src/prime-init.el:1.13 prime-el/src/prime-init.el:1.14
--- prime-el/src/prime-init.el:1.13 Mon Dec 6 17:39:38 2004
+++ prime-el/src/prime-init.el Thu Dec 9 15:42:35 2004
@@ -1,5 +1,5 @@
;;;; prime-init.el: initialize prime-el
-;;;; $Id: prime-init.el,v 1.13 2004/12/06 08:39:38 komatsu Exp $
+;;;; $Id: prime-init.el,v 1.14 2004/12/09 06:42:35 komatsu Exp $
;;;;
;;;; Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****>
;;;; All rights reserved.
@@ -76,6 +76,11 @@
(define-key map "\C-cc" 'prime-language-toggle)
(define-key map "\M-\[" 'prime-fund-insparens-insert-parens)
(define-key map "\M-\]" 'prime-fund-insparens-insert-parens-reverse)
+ (define-key map [f6] 'prime-input-set-mode-hiragana)
+ (define-key map [f7] 'prime-input-set-mode-katakana)
+ (define-key map [f8] 'prime-input-set-mode-halfkatakana)
+ (define-key map [f9] 'prime-input-set-mode-wideascii)
+ (define-key map [f10] 'prime-input-set-mode-ascii)
(setq prime-fund-mode-map map)))
;; 入力中のキーマップの設定
(or (or prime-input-mode-map forcep)