From 1195b3d5103b1661981b81457fc9a6475aa85076 Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Mon, 24 May 1999 09:07:30 +0000
Subject: [PATCH] Sync with canna.el of latest mule-base package of XEmacs.

---
 canna.el |   31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/canna.el b/canna.el
index b26a330..639268c 100644
--- a/canna.el
+++ b/canna.el
@@ -7,7 +7,7 @@
 ;; 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.18 $
+;; Version: $Revision: 1.19 $
 ;; Keywords: Canna, Japanese, input method, mule, multilingual
 
 ;; This file is part of Emacs-Canna.
@@ -60,7 +60,7 @@
 ;; end
 
 (defconst canna-rcs-version
-  "$Id: canna.el,v 1.18 1998-10-27 09:59:18 morioka Exp $")
+  "$Id: canna.el,v 1.19 1999-05-24 09:07:30 morioka Exp $")
 
 (defun canna-version ()
   "Display version of canna.el in mini-buffer."
@@ -178,13 +178,13 @@
 	(canna:memq-recursive a (cdr l)) )))
 
 (defun canna:create-mode-line ()
-  "Add string of Canna status into mode-line."
+  "Add Canna status string into mode-line."
   (cond ((featurep 'xemacs)
 	 (or (canna:memq-recursive 'mode-line-canna-mode
 				   default-modeline-format)
 	     (setq-default default-modeline-format
-			   (nconc '("" mode-line-canna-mode)
-				  default-modeline-format))
+			   (append '("" mode-line-canna-mode)
+				   default-modeline-format))
 	     )
 	 (mapcar (function
 		  (lambda (buffer)
@@ -193,8 +193,8 @@
 		      (or (canna:memq-recursive 'mode-line-canna-mode
 						modeline-format)
 			  (setq modeline-format
-				(nconc '("" mode-line-canna-mode)
-				       modeline-format))
+				(append '("" mode-line-canna-mode)
+					modeline-format))
 			  )
 		      )))
 		 (buffer-list))
@@ -285,10 +285,10 @@ t の時はデフォルトの色を使用する。
 (make-variable-buffer-local (defvar canna:*select-overlay* nil))
 
 ;;;
-;;; キーマップテーブル
+;;; Keymap table
 ;;;
 
-;; フェンスモードでのローカルマップ
+;; Fence mode local map
 (defvar canna-mode-map (make-sparse-keymap))
 
 (let ((ch 0))
@@ -443,7 +443,7 @@ See also document for canna:saved-exit-minibuffer."
 ;;;
 
 (defun canna-functional-insert-command (arg)
-  "Use input character as a key of complex translation input such as\n\
+  "Use input character as a key of complex translation input such as
 kana-to-kanji translation."
   (interactive "*p")
   (let ((ch))
@@ -453,7 +453,7 @@ kana-to-kanji translation."
     (canna:functional-insert-command2 ch arg) ))
 
 (defun canna:functional-insert-command2 (ch arg)
-  "This function actualy isert a converted Japanese string."
+  "This function actually inserts a converted Japanese string."
   ;; この関数は与えられた文字を日本語入力のためのキー入力として取り扱
   ;; い、日本語入力の中間結果を含めた処理をEmacsのバッファに反映させる
   ;; 関数である。
@@ -911,8 +911,7 @@ kana-to-kanji translation, even if you are in the minibuffer."
 	)))
 
 (defun canna-touroku-region (start end)
-  "Register a word which is indicated by region into a kana-to-kanji\n\
-dictionary."
+  "Register a word in the selected region into a kana-to-kanji dictionary."
   (interactive "r")
   (if (canna-without-newline start end)
 ;      (if canna:*japanese-mode*
@@ -1227,8 +1226,7 @@ dictionary."
 ;;;
 
 (defun canna-set-mark-command (arg)
-  "Besides setting mark, set mark as a HENKAN region if it is in\n\
-the japanese mode."
+  "Set mark, also set mark as HENKAN region if in Japanese mode."
   (interactive "P")
   (set-mark-command arg)
   (if canna:*japanese-mode*
@@ -1237,8 +1235,7 @@ the japanese mode."
 	(message "Mark set(変換領域開始)") )))
 
 (defun canna-henkan-region-or-self-insert (arg)
-  "Do kana-to-kanji convert region if HENKAN region is defined,\n\
-self insert otherwise."
+  "Do kana-to-kanji convert region if HENKAN region is defined, else insert."
   (interactive "*p")
   (if (and canna:*use-region-as-henkan-region*
 ;	   (< (mark) (point))
-- 
1.7.10.4