From: morioka <morioka>
Date: Wed, 21 Oct 1998 06:36:55 +0000 (+0000)
Subject: - Require poem.
X-Git-Tag: emacs-canna-199811302358~10
X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Femacs-canna.git;a=commitdiff_plain;h=a328795497ad77142e003e91661b4891db7888b2;hp=5f79a729e06dd040891e851190907055bfbdb799

- Require poem.
- Enclose initialization code for canna-dl-module by
  `eval-and-compile'.
---

diff --git a/canna.el b/canna.el
index 7e443f8..c2a47fe 100644
--- 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.16 $
 ;; 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,18 +38,20 @@
 
 ;;; Code:
 
-;; -*-mode: emacs-lisp-*-
+(require 'poem)
 
-(defvar canna-dl-module
-  (expand-file-name "canna.so" exec-directory))
+(eval-and-compile
+  (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)
@@ -60,7 +62,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.16 1998-10-21 06:36:55 morioka Exp $")
 
 (defun canna-version ()
   "Display version of canna.el in mini-buffer."