`self-insert-string' -> `canna-self-insert-string'.

diff --git a/canna.el b/canna.el
index 715e5cf..d6279ab 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.6 $
+;; Version: $Revision: 1.7 $
 ;; 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.6 1997-04-03 20:18:20 morioka Exp $")
+  "$Id: canna.el,v 1.7 1997-04-03 20:19:30 morioka Exp $")
 
 (defun canna-version ()
   "Display version of canna.el in mini-buffer."
@@ -82,7 +82,7 @@
 
 (cond (running-xemacs
        (require 'overlay)
-       (defun self-insert-string (string)
+       (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
@@ -94,7 +94,7 @@
             )))
        )
       (t
-       (defalias 'self-insert-string 'insert)
+       (defalias 'canna-self-insert-string 'insert)
        ))
 
 ;;; \e$B$+$s$J$NJQ?t\e(B
@@ -468,7 +468,7 @@ kana-to-kanji translation."
                (set-marker canna:*spos-undo-text* (point))
 ;;
 ;; update kbnes
-               (self-insert-string canna-kakutei-string)
+               (canna-self-insert-string canna-kakutei-string)
                ;; \e$BL$3NDj$NJ8;z$,$J$/!"3NDjJ8;zNs$N:G8e$,JD$83g8L$N\e(B
                ;; \e$BN`$@$C$?$H$-$O\e(B blink \e$B$5$;$k!#\e(B
                (if (and canna-empty-info
@@ -496,7 +496,7 @@ kana-to-kanji translation."
               (t
 ;;
 ;; update kbnes
-               (self-insert-string canna-kakutei-string)
+               (canna-self-insert-string canna-kakutei-string)
                ;; \e$BL$3NDj$NJ8;z$,$J$/!"3NDjJ8;zNs$N:G8e$,JD$83g8L$N\e(B
                ;; \e$BN`$@$C$?$H$-$O\e(B blink \e$B$5$;$k!#\e(B
                (if (and canna-empty-info