From c82acb27e36ab9c24ab985549ff3a40fe42c5b63 Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Sat, 5 Apr 1997 06:19:19 +0000
Subject: [PATCH] Use emu.

---
 canna.el |   52 +++++++++++++++++-----------------------------------
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/canna.el b/canna.el
index bf3ef96..107eb24 100644
--- 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)
+	    ;; 挿入の途中で 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)
+  )
 
-(cond (running-xemacs
-       (require 'overlay)
-       (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))
-	     )))
-       )
-      (t
-       (defalias 'canna-self-insert-string 'insert)
-       ))
 
 ;;; かんなの変数
 
-- 
1.7.10.4