CVS update by scop xemacs/lisp/mule ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/02/11 19:55:44

  Modified:    xemacs/lisp/mule canna-leim.el
Log:
Look for canna_api instead of canna/canna_api <200701212201.28062.scop at xemacs.org>, <877iuwhqpz.fsf at uwakimon.sk.tsukuba.ac.jp>

Revision  Changes    Path
1.786     +5 -0      XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.785
retrieving revision 1.786
diff -u -p -r1.785 -r1.786
--- ChangeLog	2007/02/05 15:19:17	1.785
+++ ChangeLog	2007/02/11 18:55:40	1.786
@@ -1,3 +1,8 @@
+2007-01-21  Ville Skyttä  <scop at xemacs.org>
+
+	* mule/canna-leim.el (canna-activate): Look for canna_api, not
+	canna/canna_api.
+
 2007-01-27  Mike Sperber  <mike at xemacs.org>
 
 	* setup-paths.el (paths-module-load-path-depth): Add.



1.10      +3 -3      XEmacs/xemacs/lisp/mule/canna-leim.el

Index: canna-leim.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/canna-leim.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- canna-leim.el	2005/10/21 15:48:33	1.9
+++ canna-leim.el	2007/02/11 18:55:43	1.10
@@ -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)