Sync with canna.el of latest mule-base package of XEmacs.

[elisp/emacs-canna.git] / canna.el

diff --git a/canna.el b/canna.el
index c03d6c6..639268c 100644 (file)
--- 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.17 $
+;; 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.17 1998-10-26 16:34:32 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 \e$B$N;~$O%G%U%)%k%H$N?'$r;HMQ$9$k!#\e(B
 (make-variable-buffer-local (defvar canna:*select-overlay* nil))
 
 ;;;
-;;; \e$B%-!<%^%C%W%F!<%V%k\e(B
+;;; Keymap table
 ;;;
 
-;; \e$B%U%'%s%9%b!<%I$G$N%m!<%+%k%^%C%W\e(B
+;; 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."
   ;; \e$B$3$N4X?t$OM?$($i$l$?J8;z$rF|K\8lF~NO$N$?$a$N%-!<F~NO$H$7$F<h$j07\e(B
   ;; \e$B$$!"F|K\8lF~NO$NCf4V7k2L$r4^$a$?=hM}$r\e(BEmacs\e$B$N%P%C%U%!$KH?1G$5$;$k\e(B
   ;; \e$B4X?t$G$"$k!#\e(B
@@ -850,10 +850,11 @@ kana-to-kanji translation, even if you are in the minibuffer."
                                 canna:*saved-mode-string*
                               new-mode)))
                        0)))
-  (setq canna:*local-map-backup*  (current-local-map))
+  (setq canna:*local-map-backup* (current-local-map))
   (setq canna:*fence-mode* t)
   ;; XEmacs change:
-  (buffer-disable-undo (current-buffer))
+  ;; (buffer-disable-undo (current-buffer))
+  ;; Original:
   ;; (if (boundp 'disable-undo)
   ;;     (setq disable-undo canna:*fence-mode*))
   (use-local-map canna-mode-map))
@@ -875,7 +876,8 @@ kana-to-kanji translation, even if you are in the minibuffer."
                   (canna-toggle-japanese-mode)
                 (mode-line-canna-mode-update canna:*alpha-mode-string*) )))
         ;; XEmacs change:
-        (buffer-enable-undo (current-buffer))
+         ;; (buffer-enable-undo (current-buffer))
+        ;; Original:
          ;; (if (boundp 'disable-undo)
          ;;     (setq disable-undo canna:*fence-mode*))
         ))
@@ -909,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*
@@ -1225,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*
@@ -1235,8 +1235,7 @@ the japanese mode."
        (message "Mark set(\e$BJQ49NN0h3+;O\e(B)") )))
 
 (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))