Use emu.

diff --git a/canna.el b/canna.el
index bf3ef96..107eb24 100644 (file)
--- a/canna.el
+++ b/canna.el
@@ -5,7 +5,7 @@
 
 ;; Author: Akira Kon <kon@d1.bs2.mt.nec.co.jp>
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Revision: 1.8 $
+;; Version: $Revision: 1.9 $
 ;; Keywords: Canna, Japanese, input method, mule, multilingual
 
 ;; This file is not a part of Emacs yet.
@@ -49,7 +49,7 @@
 ;; end
 
 (defconst canna-rcs-version
-  "$Id: canna.el,v 1.8 1997-04-03 22:44:17 morioka Exp $")
+  "$Id: canna.el,v 1.9 1997-04-05 06:19:19 morioka Exp $")
 
 (defun canna-version ()
   "Display version of canna.el in mini-buffer."
@@ -62,40 +62,22 @@
                         ))
            " ...")))
 
-;; added by MORIOKA Tomohiko <morioka@jaist.ac.jp>, 1996/6/7
-(or (fboundp 'minibuffer-prompt-width)
-    (defun minibuffer-prompt-width ()
-      "Return the display width of the minibuffer prompt."
-      (save-excursion
-       (set-buffer (window-buffer (minibuffer-window)))
-       (current-column)
-       ))
-    )
-
-;; added by MORIOKA Tomohiko <morioka@jaist.ac.jp>, 1997/4/3
-(or (fboundp 'char-or-char-int-p)
-    (defalias 'char-or-char-int-p 'integerp)
-    )
-
-;; added by MORIOKA Tomohiko <morioka@jaist.ac.jp>, 1996/6/18
-(defvar running-xemacs (string-match "XEmacs" emacs-version))
+(require 'emu)
+
+(if running-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)
+  )
 
-(cond (running-xemacs
-       (require 'overlay)
-       (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))
-            )))
-       )
-      (t
-       (defalias 'canna-self-insert-string 'insert)
-       ))
 
 ;;; \e$B$+$s$J$NJQ?t\e(B