# HG changeset patch
# User scop
# Date 1171220143 0
# Node ID 50d74a9d19b7fe1e131edc9322b0c0ab0b3545fb
# Parent  91f4f3f0c171724b29075cd34805100b67172697
[xemacs-hg @ 2007-02-11 18:55:40 by scop]
Look for canna_api instead of canna/canna_api <200701212201.28062.scop@xemacs.org>, <877iuwhqpz.fsf@uwakimon.sk.tsukuba.ac.jp>

diff -r 91f4f3f0c171 -r 50d74a9d19b7 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Feb 10 22:51:20 2007 +0000
+++ b/lisp/ChangeLog	Sun Feb 11 18:55:43 2007 +0000
@@ -1,3 +1,8 @@
+2007-01-21  Ville Skyttä  <scop@xemacs.org>
+
+	* mule/canna-leim.el (canna-activate): Look for canna_api, not
+	canna/canna_api.
+
 2007-01-27  Mike Sperber  <mike@xemacs.org>
 
 	* setup-paths.el (paths-module-load-path-depth): Add.
diff -r 91f4f3f0c171 -r 50d74a9d19b7 lisp/mule/canna-leim.el
--- a/lisp/mule/canna-leim.el	Sat Feb 10 22:51:20 2007 +0000
+++ b/lisp/mule/canna-leim.el	Sun Feb 11 18:55:43 2007 +0000
@@ -35,17 +35,17 @@
 (globally-declare-boundp 'canna:*japanese-mode*)
 (globally-declare-fboundp '(canna canna-toggle-japanese-mode))
 
-;; use (locate-file "canna/canna_api" module-load-path module-extensions)
+;; use (locate-file "canna_api" module-load-path module-extensions)
 ;; to locate the module without loading it.
 ;; then we could autoload canna-activate and dump and/or autoload:
-;; (and (locate-file "canna/canna_api" module-load-path module-extensions)
+;; (and (locate-file "canna_api" module-load-path module-extensions)
 ;;      (locate-library "canna")
 ;;      (register-input-method 'japanese-canna "Japanese" 'canna-activate nil
 ;;       "Canna - a kana to kanji conversion program"))
 
 (defun canna-activate (&optional name)
   ;; XEmacs 21.5.10 and later have 3-argument require.
-  (unless (require 'CANNA "canna/canna_api" 'no-error)
+  (unless (require 'CANNA "canna_api" 'no-error)
     (error 'file-error
 	   "No Canna API support!? See M-x describe-installation & C-h v module-load-path."))
   (unless (require 'canna nil 'no-error)