update.

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

diff --git a/canna.el b/canna.el
index 7e443f8..b26a330 100644 (file)
--- a/canna.el
+++ b/canna.el
@@ -7,10 +7,10 @@
 ;; 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.15 $
+;; Version: $Revision: 1.18 $
 ;; Keywords: Canna, Japanese, input method, mule, multilingual
 
-;; This file is not a part of Emacs yet.
+;; This file is part of Emacs-Canna.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -38,7 +38,7 @@
 
 ;;; Code:
 
-;; -*-mode: emacs-lisp-*-
+(require 'poem)
 
 (defvar canna-dl-module
   (expand-file-name "canna.so" exec-directory))
@@ -60,7 +60,7 @@
 ;; end
 
 (defconst canna-rcs-version
-  "$Id: canna.el,v 1.15 1998-02-09 13:09:08 morioka Exp $")
+  "$Id: canna.el,v 1.18 1998-10-27 09:59:18 morioka Exp $")
 
 (defun canna-version ()
   "Display version of canna.el in mini-buffer."
@@ -733,8 +733,8 @@ kana-to-kanji translation, even if you are in the minibuffer."
 ;;; canna-functional-insert-command \e$B$r8F$V!#\e(B
 ;;;
 
-(if (not (boundp 'MULE)) ; for Nemacs
-    (defun cancel-undo-boundary ()))
+;; (if (not (boundp 'MULE)) ; for Nemacs
+;;     (defun cancel-undo-boundary ()))
 
 (defun canna-self-insert-command (arg)
   "Self insert pressed key and use it to assemble Romaji character."
@@ -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*))
         ))