(canna-self-insert-string-filter): New variable for XEmacs.

[elisp/emacs-canna.git] / canna.el

diff --git a/canna.el b/canna.el
index 639268c..9e89926 100644 (file)
--- 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 <kon@d1.bs2.mt.nec.co.jp>
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;         Stephen Turnbull <turnbull@sk.tsukuba.ac.jp>
-;; Version: $Revision: 1.19 $
+;; Version: $Revision: 1.21 $
 ;; Keywords: Canna, Japanese, input method, mule, multilingual
 
 ;; This file is part of Emacs-Canna.
@@ -59,33 +59,31 @@
 ;; (defalias 'self-insert-internal 'self-insert-command)
 ;; end
 
-(defconst canna-rcs-version
-  "$Id: canna.el,v 1.19 1999-05-24 09:07:30 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)
-           ;; \e$BA^F~$NESCf$G\e(B blink \e$B$,5/$-$k$H$&$C$H$*$7$$$N$G!"\e(B
-           ;; \e$B0l;~E*$K\e(B blink \e$B$rM^;_$9$k!#\e(B
-           (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)
+         ;; \e$BA^F~$NESCf$G\e(B blink \e$B$,5/$-$k$H$&$C$H$*$7$$$N$G!"\e(B
+         ;; \e$B0l;~E*$K\e(B blink \e$B$rM^;_$9$k!#\e(B
+         (blink-matching-paren nil))
+      (while (< i len)
+       (self-insert-internal (aref string i))
+       (setq i (1+ i)))))
   )
+ (t
+  (defalias 'canna-self-insert-string 'insert)
+  ))
 
 
 ;;; \e$B$+$s$J$NJQ?t\e(B