(canna-dl-module): New variable.

(canna-dl-handle): New variable.

diff --git a/canna.el b/canna.el
index 107eb24..0ea53ea 100644 (file)
--- a/canna.el
+++ b/canna.el
@@ -1,11 +1,11 @@
 ;;; canna.el --- Interface to the Canna input method.
 
 ;; Copyright (C) 1994 Akira Kon, NEC Corporation.
-;; Copyright (C) 1996,1997 MORIOKA Tomohiko
+;; Copyright (C) 1996,1997,1998 MORIOKA Tomohiko
 
 ;; Author: Akira Kon <kon@d1.bs2.mt.nec.co.jp>
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Revision: 1.9 $
+;; Version: $Revision: 1.10 $
 ;; Keywords: Canna, Japanese, input method, mule, multilingual
 
 ;; This file is not a part of Emacs yet.
@@ -38,18 +38,23 @@
 
 ;; -*-mode: emacs-lisp-*-
 
-;; by \e$B<i2,\e(B \e$BCNI'\e(B <morioka@jaist.ac.jp> 1996/11/11
-(or (boundp 'CANNA)
-    (let ((handle (dynamic-link (expand-file-name "canna.so" exec-directory))))
-      (dynamic-call "emacs_canna_init" handle))
-    )
+(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 self-insert-after-hook nil)
 ;; (defalias 'self-insert-internal 'self-insert-command)
 ;; end
 
 (defconst canna-rcs-version
-  "$Id: canna.el,v 1.9 1997-04-05 06:19:19 morioka Exp $")
+  "$Id: canna.el,v 1.10 1998-01-16 08:49:29 morioka Exp $")
 
 (defun canna-version ()
   "Display version of canna.el in mini-buffer."