X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Femacs-canna.git;a=blobdiff_plain;f=canna.el;h=9e89926ae4d02d8c7e2bb76885fdfd5241362589;hp=c2a47fe8a98653dae039df2da2bc5a9bff9e4795;hb=840ae24229e63454f9130150d280ed4aceeb1251;hpb=a328795497ad77142e003e91661b4891db7888b2 diff --git a/canna.el b/canna.el index c2a47fe..9e89926 100644 --- a/canna.el +++ b/canna.el @@ -1,13 +1,13 @@ ;;; canna.el --- Interface to the Canna input method. ;; Copyright (C) 1994 Akira Kon, NEC Corporation. -;; Copyright (C) 1996,1997,1998 MORIOKA Tomohiko +;; Copyright (C) 1996,1997,1998,2004 MORIOKA Tomohiko ;; Copyright (C) 1997 Stephen Turnbull ;; Author: Akira Kon ;; MORIOKA Tomohiko ;; Stephen Turnbull -;; Version: $Revision: 1.16 $ +;; Version: $Revision: 1.21 $ ;; Keywords: Canna, Japanese, input method, mule, multilingual ;; This file is part of Emacs-Canna. @@ -40,18 +40,16 @@ (require 'poem) -(eval-and-compile - (defvar canna-dl-module - (expand-file-name "canna.so" exec-directory)) +(defvar canna-dl-module + (expand-file-name "canna.so" exec-directory)) - (defvar canna-dl-handle - (and (not (boundp 'CANNA)) - (fboundp 'dynamic-link) - (dynamic-link canna-dl-module))) - - (and canna-dl-handle - (dynamic-call "emacs_canna_init" canna-dl-handle)) - ) +(defvar canna-dl-handle + (and (not (boundp 'CANNA)) + (fboundp 'dynamic-link) + (dynamic-link canna-dl-module))) + +(and canna-dl-handle + (dynamic-call "emacs_canna_init" canna-dl-handle)) (or (boundp 'CANNA) (featurep 'CANNA) @@ -61,33 +59,31 @@ ;; (defalias 'self-insert-internal 'self-insert-command) ;; end -(defconst canna-rcs-version - "$Id: canna.el,v 1.16 1998-10-21 06:36:55 morioka Exp $") +(defconst canna-version "Emacs-Canna 1.3") (defun canna-version () "Display version of canna.el in mini-buffer." (interactive) - (message (concat - (substring canna-rcs-version - 5 - (if (string-match "[0-9] [a-z]" canna-rcs-version) - (1+ (match-beginning 0)) - )) - " ..."))) - -(if (featurep 'xemacs) - (defun canna-self-insert-string (string) - (let ((len (length string)) - (i 0) - ;; 挿入の途中で blink が起きるとうっとおしいので、 - ;; 一時的に blink を抑止する。 - (blink-matching-paren nil)) - (while (< i len) - (self-insert-internal (aref canna-kakutei-string i)) - (setq i (1+ i)) - ))) - (defalias 'canna-self-insert-string 'insert) + (message (concat canna-version " ..."))) + +(cond + ((featurep 'xemacs) + (defvar canna-self-insert-string-filter (function identity)) + (defun canna-self-insert-string (string) + (if (fboundp canna-self-insert-string-filter) + (setq string (funcall canna-self-insert-string-filter string))) + (let ((len (length string)) + (i 0) + ;; 挿入の途中で blink が起きるとうっとおしいので、 + ;; 一時的に blink を抑止する。 + (blink-matching-paren nil)) + (while (< i len) + (self-insert-internal (aref string i)) + (setq i (1+ i))))) ) + (t + (defalias 'canna-self-insert-string 'insert) + )) ;;; かんなの変数 @@ -180,13 +176,13 @@ (canna:memq-recursive a (cdr l)) ))) (defun canna:create-mode-line () - "Add string of Canna status into mode-line." + "Add Canna status string into mode-line." (cond ((featurep 'xemacs) (or (canna:memq-recursive 'mode-line-canna-mode default-modeline-format) (setq-default default-modeline-format - (nconc '("" mode-line-canna-mode) - default-modeline-format)) + (append '("" mode-line-canna-mode) + default-modeline-format)) ) (mapcar (function (lambda (buffer) @@ -195,8 +191,8 @@ (or (canna:memq-recursive 'mode-line-canna-mode modeline-format) (setq modeline-format - (nconc '("" mode-line-canna-mode) - modeline-format)) + (append '("" mode-line-canna-mode) + modeline-format)) ) ))) (buffer-list)) @@ -287,10 +283,10 @@ t の時はデフォルトの色を使用する。 (make-variable-buffer-local (defvar canna:*select-overlay* nil)) ;;; -;;; キーマップテーブル +;;; Keymap table ;;; -;; フェンスモードでのローカルマップ +;; Fence mode local map (defvar canna-mode-map (make-sparse-keymap)) (let ((ch 0)) @@ -445,7 +441,7 @@ See also document for canna:saved-exit-minibuffer." ;;; (defun canna-functional-insert-command (arg) - "Use input character as a key of complex translation input such as\n\ + "Use input character as a key of complex translation input such as kana-to-kanji translation." (interactive "*p") (let ((ch)) @@ -455,7 +451,7 @@ kana-to-kanji translation." (canna:functional-insert-command2 ch arg) )) (defun canna:functional-insert-command2 (ch arg) - "This function actualy isert a converted Japanese string." + "This function actually inserts a converted Japanese string." ;; この関数は与えられた文字を日本語入力のためのキー入力として取り扱 ;; い、日本語入力の中間結果を含めた処理をEmacsのバッファに反映させる ;; 関数である。 @@ -735,8 +731,8 @@ kana-to-kanji translation, even if you are in the minibuffer." ;;; canna-functional-insert-command を呼ぶ。 ;;; -(if (not (boundp 'MULE)) ; for Nemacs - (defun cancel-undo-boundary ())) +;; (if (not (boundp 'MULE)) ; for Nemacs +;; (defun cancel-undo-boundary ())) (defun canna-self-insert-command (arg) "Self insert pressed key and use it to assemble Romaji character." @@ -852,10 +848,11 @@ kana-to-kanji translation, even if you are in the minibuffer." canna:*saved-mode-string* new-mode))) 0))) - (setq canna:*local-map-backup* (current-local-map)) + (setq canna:*local-map-backup* (current-local-map)) (setq canna:*fence-mode* t) ;; XEmacs change: - (buffer-disable-undo (current-buffer)) + ;; (buffer-disable-undo (current-buffer)) + ;; Original: ;; (if (boundp 'disable-undo) ;; (setq disable-undo canna:*fence-mode*)) (use-local-map canna-mode-map)) @@ -877,7 +874,8 @@ kana-to-kanji translation, even if you are in the minibuffer." (canna-toggle-japanese-mode) (mode-line-canna-mode-update canna:*alpha-mode-string*) ))) ;; XEmacs change: - (buffer-enable-undo (current-buffer)) + ;; (buffer-enable-undo (current-buffer)) + ;; Original: ;; (if (boundp 'disable-undo) ;; (setq disable-undo canna:*fence-mode*)) )) @@ -911,8 +909,7 @@ kana-to-kanji translation, even if you are in the minibuffer." ))) (defun canna-touroku-region (start end) - "Register a word which is indicated by region into a kana-to-kanji\n\ -dictionary." + "Register a word in the selected region into a kana-to-kanji dictionary." (interactive "r") (if (canna-without-newline start end) ; (if canna:*japanese-mode* @@ -1227,8 +1224,7 @@ dictionary." ;;; (defun canna-set-mark-command (arg) - "Besides setting mark, set mark as a HENKAN region if it is in\n\ -the japanese mode." + "Set mark, also set mark as HENKAN region if in Japanese mode." (interactive "P") (set-mark-command arg) (if canna:*japanese-mode* @@ -1237,8 +1233,7 @@ the japanese mode." (message "Mark set(変換領域開始)") ))) (defun canna-henkan-region-or-self-insert (arg) - "Do kana-to-kanji convert region if HENKAN region is defined,\n\ -self insert otherwise." + "Do kana-to-kanji convert region if HENKAN region is defined, else insert." (interactive "*p") (if (and canna:*use-region-as-henkan-region* ; (< (mark) (point))