Attachment 146096 Details for Bug 222559 – Make canna-activate look from the installed path

[patch] Make canna-activate look from the installed path

canna_api-location.patch (text/plain), 1.37 KB, created by Ville Skyttä on 2007-01-21 20:02:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-01-21 20:02:14 UTC

Size: 1.37 KB

patch

obsolete

>Index: lisp/mule/canna-leim.el
>===================================================================
>RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/canna-leim.el,v
>retrieving revision 1.9
>diff -u -r1.9 canna-leim.el
>--- lisp/mule/canna-leim.el	21 Oct 2005 15:48:33 -0000	1.9
>+++ lisp/mule/canna-leim.el	21 Jan 2007 19:58:55 -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)

Actions: View | Diff

Attachments on bug 222559: 146096