From d452738eb692e16c6c96d533a0e1893932609930 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 26 Oct 1998 16:34:32 +0000 Subject: [PATCH] - Don't enclose initialization code for canna-dl-module by `eval-and-compile'. - Abolish function `cancel-undo-boundary' because it is defined in poem. --- canna.el | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/canna.el b/canna.el index c2a47fe..c03d6c6 100644 --- a/canna.el +++ b/canna.el @@ -7,7 +7,7 @@ ;; Author: Akira Kon ;; MORIOKA Tomohiko ;; Stephen Turnbull -;; Version: $Revision: 1.16 $ +;; Version: $Revision: 1.17 $ ;; Keywords: Canna, Japanese, input method, mule, multilingual ;; This file is part of Emacs-Canna. @@ -40,18 +40,16 @@ (require 'poem) -(eval-and-compile - (defvar canna-dl-module - (expand-file-name "canna.so" exec-directory)) +(defvar canna-dl-module + (expand-file-name "canna.so" exec-directory)) - (defvar canna-dl-handle - (and (not (boundp 'CANNA)) - (fboundp 'dynamic-link) - (dynamic-link canna-dl-module))) - - (and canna-dl-handle - (dynamic-call "emacs_canna_init" canna-dl-handle)) - ) +(defvar canna-dl-handle + (and (not (boundp 'CANNA)) + (fboundp 'dynamic-link) + (dynamic-link canna-dl-module))) + +(and canna-dl-handle + (dynamic-call "emacs_canna_init" canna-dl-handle)) (or (boundp 'CANNA) (featurep 'CANNA) @@ -62,7 +60,7 @@ ;; end (defconst canna-rcs-version - "$Id: canna.el,v 1.16 1998-10-21 06:36:55 morioka Exp $") + "$Id: canna.el,v 1.17 1998-10-26 16:34:32 morioka Exp $") (defun canna-version () "Display version of canna.el in mini-buffer." @@ -735,8 +733,8 @@ kana-to-kanji translation, even if you are in the minibuffer." ;;; canna-functional-insert-command を呼ぶ。 ;;; -(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." -- 1.7.10.4