From: morioka <morioka>
Date: Thu, 3 Apr 1997 20:19:30 +0000 (+0000)
Subject: `self-insert-string' -> `canna-self-insert-string'.
X-Git-Tag: emacs-canna-199811302358~30
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=700435fe98f9a11a81e71b7f2370d412a409ce4a;p=elisp%2Femacs-canna.git

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

diff --git a/canna.el b/canna.el
index 715e5cf..d6279ab 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.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)
 	       ;; 挿入の途中で blink が起きるとうっとおしいので、
@@ -94,7 +94,7 @@
 	     )))
        )
       (t
-       (defalias 'self-insert-string 'insert)
+       (defalias 'canna-self-insert-string 'insert)
        ))
 
 ;;; かんなの変数
@@ -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)
 		;; 未確定の文字がなく、確定文字列の最後が閉じ括弧の
 		;; 類だったときは blink させる。
 		(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)
 		;; 未確定の文字がなく、確定文字列の最後が閉じ括弧の
 		;; 類だったときは blink させる。
 		(if (and canna-empty-info