diff -ruwN tamago-4.0.6-canna-20011110/ChangeLog tamago/ChangeLog
--- tamago-4.0.6-canna-20011110/ChangeLog	Tue Oct 23 21:45:16 2001
+++ tamago/ChangeLog	Tue Dec  4 16:47:00 2001
@@ -1,3 +1,92 @@
+2001-12-01  ?
+
+	* egg/wnn.el (wnn-server-info-list): Use `defvar' instead of
+	`defconst' to define it.
+
+2001-12-01  KATAYAMA Yoshio  <kate@pfu.fujitsu.com>
+
+	* egg-x0213.el: New file.
+
+2001-11-10  Kinji Itoh  <kinji-i@gray.plala.or.jp>
+	(cf. http://cgi18.plala.or.jp/nyy/canna/canna-20011023-20011110.diff)
+
+	* egg/canna.el (canna-server-port): Default to the string "canna".
+	(cannna-open): Treat the port name as a string instead of a number.
+
+2001-11-08  Kinji Itoh  <kinji-i@gray.plala.or.jp> (cf. [tamago:00546])
+
+	* egg/canna.el (canna-set-converted-yomi): New function.
+	(canna-start-conversion): Use it.
+	(canna-change-bunsetsu-length): Use it.
+
+2001-10-22  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+	(cf. [tamago:00534])
+
+	* egg/canna.el (canna-word-delete-regist): Signal an error using
+	`egg-error' if there is no text for yomi.
+
+2001-08-16  KATAYAMA Yoshio  <kate@pfu.fujitsu.com> (cf. [tamago:00516])
+
+	* its/greek.el: New file.
+
+2001-07-24  KATAYAMA Yoshio  <kate@pfu.fujitsu.com> (cf. [tamago:00504])
+
+	* eggrc (wnn7-jserver-setup): New function.
+
+2001-06-28  Yoshiki Hayashi  <yoshiki@xemacs.org> (cf. [tamago:00468])
+
+	* egg-cnv.el (egg-end-of-conversion-buffer): Replace
+	`next-single-property-change' to `egg-next-single-property-change'.
+	(egg-decide-before-point): Ditto.
+	(egg-exit-conversion): Ditto.
+	(egg-abort-conversion): Ditto.
+
+	* egg.el (egg-last-method-name): Default to nil.
+
+	* its-keydef.el: Set the default value of `its-select-func-alist'
+	to nil.
+
+	* its.el (its-current-language): Default to nil.
+	(its-mode-map): Use `(meta KEY)' instead of `M-KEY'.
+
+	* egg/canna.el (canna-open): Use `binary' instead of
+	`no-conversion' for the process coding-system.
+	* egg/sj3.el (sj3-open): Ditto.
+	* egg/wnn.el (wnn-open): Ditto.
+
+	* egg/wnnrpc.el (wnnrpc-with-temp-buffer): Use `binary' instead of
+	`no-conversion'.
+	(wnnrpc-with-write-file): Ditto.
+
+2001-05-24  KATAYAMA Yoshio  <kate@pfu.fujitsu.com> (cf. [tamago:00462])
+
+	* its/aynu.el: Require `cl' when compiling.
+
+2001-05-23  Katsumi Yamaoka  <yamaoka@jpl.org> (cf. [tamago:00461])
+
+	* egg.el: Require `cl' only when compiling.
+	* its.el: Ditto.
+
+2001-05-22  KATAYAMA Yoshio <kate@pfu.fujitsu.com>
+
+	* its.el (its-delete-by-character): New customizable variable.
+	(its-delete-backward-SYL): Delete a character as a unit even if
+	just after input, if its-delete-by-character is non-NIL.
+
+2001-04-16  KATAYAMA Yoshio <kate@pfu.co.jp>
+
+	* egg.el (egg-setup-invisibility-spec): New function for setup
+	buffer-invisibilty-spec.
+
+	* its.el (its-setup-fence-mode): Change the value of invisible
+	property to egg.
+
+	* egg-cnv.el (egg-convert-region): Change the value of invisible
+	property to egg.
+
+	* jisx0213.el: Correct JIS X 0213 definition. (suggested by
+	T. Kawabata)
+
 2000-06-02  KATAYAMA Yoshio <kate@pfu.co.jp>
 
 	* egg/wnn.el (wnn): Fix docstring.
@@ -126,7 +215,7 @@
 
 2000-01-17  TOMURA Satoru <tomura@etl.go.jp>
 
-	* Version 4.0.6 released
+	* Version 4.0.6 released.
 	
 2000-01-17  TOMURA Satoru <tomura@etl.go.jp>
 
@@ -182,6 +271,7 @@
 	* egg/sj3.el (sj3-end-conversion): Restrain from overrunning.
 	
 2000-01-13  Katsumi Yamaoka <yamaoka@jpl.org>
+
 	* egg/sj3rpc.el (sj3rpc-open): Use `sj3-server-version' instead of
 	2.
 	(sj3rpc-unpack-mb-string): New macro.
@@ -278,5 +368,3 @@
 2000-01-05  Tomura Satoru   <tomura@etl.go.jp>
 	
 	* Version 4.0.0 released.
-	
-
diff -ruwN tamago-4.0.6-canna-20011110/egg/canna.el tamago/egg/canna.el
--- tamago-4.0.6-canna-20011110/egg/canna.el	Sat Nov 10 16:55:31 2001
+++ tamago/egg/canna.el	Tue Dec  4 16:47:00 2001
@@ -42,7 +42,7 @@
   :group 'canna :type 'string)
 
 (defcustom canna-server-port "canna"
-  "Port number of CANNA server"
+  "A service name or a port number (should be a string) of CANNA server"
   :group 'canna :type 'string)
 
 (defcustom canna-user-name nil
@@ -345,7 +345,7 @@
 		((error quit))))
 	    (when proc
 	      (process-kill-without-query proc)
-	      (set-process-coding-system proc 'no-conversion 'no-conversion)
+	      (set-process-coding-system proc 'binary 'binary)
 	      (set-process-sentinel proc 'canna-comm-sentinel)
 	      (set-marker-insertion-type (process-mark proc) t)
 	      (setq result (cannarpc-open proc user-name)) ;; result is context
@@ -470,7 +470,7 @@
 (defun canna-init ()
   )
 
-(defun canna-set-converted-yomi (env bunsetsu-pos bunsetsu-list)
+(defun canna-set-converted-yomi (bunsetsu-pos bunsetsu-list)
   (let ((bl bunsetsu-list)
 	(i bunsetsu-pos)
 	b)
@@ -493,7 +493,7 @@
 	  (setq env (canna-get-environment backend))
 		(canna-finalize-backend)))
 	  (setq bunsetsu-list (cannarpc-begin-conversion env yomi))))
-    (canna-set-converted-yomi env 0 bunsetsu-list)))
+    (canna-set-converted-yomi 0 bunsetsu-list)))
 
 (defun canna-end-conversion (bunsetsu-list abort)
   (let* ((env (canna-bunsetsu-get-env (car bunsetsu-list)))
@@ -598,7 +598,7 @@
 	 new)
     (if yomi-length
 	(setq new (canna-set-converted-yomi
-		   env bunsetsu-pos
+		   bunsetsu-pos
 		   (cannarpc-set-kugiri-changed env yomi-length bunsetsu-pos)))
       (setq new bunsetsu))
     (list (list (car new)) prev-b (cdr new))))
diff -ruwN tamago-4.0.6-canna-20011110/egg/sj3.el tamago/egg/sj3.el
--- tamago-4.0.6-canna-20011110/egg/sj3.el	Tue Oct 23 21:45:16 2001
+++ tamago/egg/sj3.el	Tue Dec  4 16:47:00 2001
@@ -147,7 +147,7 @@
       ((error quit)
        (egg-error "failed to connect sj3 server")))
     (process-kill-without-query proc)
-    (set-process-coding-system proc 'no-conversion 'no-conversion)
+    (set-process-coding-system proc 'binary 'binary)
     (set-marker-insertion-type (process-mark proc) t)
     (save-excursion
       (set-buffer buf)
@@ -198,7 +198,7 @@
 ;;       (if proc
 ;; 	  (progn
 ;; 	    (process-kill-without-query proc)
-;; 	    (set-process-coding-system proc 'no-conversion 'no-conversion)
+;; 	    (set-process-coding-system proc 'binary 'binary)
 ;; 	    (set-marker-insertion-type (process-mark proc) t)
 ;; 	    ;; Initialize dictionaries
 ;; 	    (setq sj3-sys-dict-list nil)
diff -ruwN tamago-4.0.6-canna-20011110/egg/wnn.el tamago/egg/wnn.el
--- tamago-4.0.6-canna-20011110/egg/wnn.el	Tue Oct 23 21:45:16 2001
+++ tamago/egg/wnn.el	Tue Dec  4 16:47:00 2001
@@ -396,7 +396,6 @@
 ;;                     	<zenkouho-info> <freq-down> <fi-rel> <context> ]
 ;;
 ;; <zenkouho-info> ::= [ <pos> <list> <converted> <dai> <prev-b> <nxet-b> ]
-;;                    
 
 (defsubst wnn-bunsetsu-create (env jirilen dic-no entry freq right-now hinshi
 			       status status-backward kangovect evaluation)
@@ -557,7 +556,7 @@
 				 (copy-sequence (egg-bunsetsu-get-info b))))
 	  bunsetsu))
 
-(defconst wnn-server-info-list
+(defvar wnn-server-info-list
   ;; language    server  port      hostname    proc   coding-system
   '((Japanese    jserver wnn-jport wnn-jserver "Wnn"  (fixed-euc-jp    fixed-euc-jp))
     (Chinese-GB  cserver wnn-cport wnn-cserver "cWnn" (fixed-euc-py-cn fixed-euc-zy-cn))
@@ -1246,7 +1245,7 @@
 		((error quit))))
 	    (when proc
 	      (process-kill-without-query proc)
-	      (set-process-coding-system proc 'no-conversion 'no-conversion)
+	      (set-process-coding-system proc 'binary 'binary)
 	      (set-process-sentinel proc 'wnn-comm-sentinel)
 	      (set-marker-insertion-type (process-mark proc) t)
 	      (setq result (wnnrpc-open proc myname user-name))
diff -ruwN tamago-4.0.6-canna-20011110/egg/wnnrpc.el tamago/egg/wnnrpc.el
--- tamago-4.0.6-canna-20011110/egg/wnnrpc.el	Tue Oct 23 21:45:16 2001
+++ tamago/egg/wnnrpc.el	Tue Dec  4 16:47:00 2001
@@ -1454,16 +1454,16 @@
 
 (defmacro wnnrpc-with-temp-buffer (&rest body)
   `(with-temp-buffer
-     (let ((coding-system-for-read 'no-conversion)
-	   (coding-system-for-write 'no-conversion))
+     (let ((coding-system-for-read 'binary)
+	   (coding-system-for-write 'binary))
        (set-buffer-multibyte nil)
        ,@body)))
 
 (defmacro wnnrpc-with-write-file (filename error-handler &rest body)
   `(condition-case error
        (with-temp-file ,filename
-	 (let ((coding-system-for-read 'no-conversion)
-	       (coding-system-for-write 'no-conversion))
+	 (let ((coding-system-for-read 'binary)
+	       (coding-system-for-write 'binary))
 	   (set-buffer-multibyte nil)
 	   ,@body))
      (file-error ,error-handler)))
@@ -1768,4 +1768,4 @@
 	  (backward-char))
       (buffer-substring 1 (point))))))
 
-;;; egg/wnnrpc.el ends here.
+;;; egg/wnnrpc.el ends here
diff -ruwN tamago-4.0.6-canna-20011110/egg-cnv.el tamago/egg-cnv.el
--- tamago-4.0.6-canna-20011110/egg-cnv.el	Tue Oct 23 21:45:17 2001
+++ tamago/egg-cnv.el	Tue Dec  4 16:47:01 2001
@@ -303,6 +303,7 @@
 	;; nothing to do
 	nil
       (delete-region start end)
+      (egg-setup-invisibility-spec)
       (let ((inhibit-read-only t))
 	(its-define-select-keys egg-conversion-map)
 	(goto-char start)
@@ -317,13 +318,13 @@
 	(if context
 	    (put-text-property 0 len 'egg-context context s))
 	(if egg-conversion-fence-invisible
-	    (put-text-property 0 len 'invisible t s))
+	    (put-text-property 0 len 'invisible 'egg s))
 	(insert s)
 	(setq s (copy-sequence egg-conversion-fence-close)
 	      len (length s))
 	(set-text-properties 0 len '(read-only t rear-nonsticky t egg-end t) s)
 	(if egg-conversion-fence-invisible
-	    (put-text-property 0 len 'invisible t s))
+	    (put-text-property 0 len 'invisible 'egg s))
 	(insert s)
 	(goto-char start)
 	(insert source)
@@ -672,7 +673,7 @@
    ((<= n 0)
     (egg-beginning-of-conversion-buffer 1))
    (t
-    (goto-char (next-single-property-change (point) 'egg-end))
+    (goto-char (egg-next-single-property-change (point) 'egg-end))
     (backward-char))))
 
 (defun egg-backward-bunsetsu (n)
@@ -1106,13 +1107,13 @@
 		  (previous-single-property-change (point) 'egg-start)))
 	 (end (if (get-text-property (point) 'egg-end)
 		  (point)
-		(next-single-property-change (point) 'egg-end)))
+		(egg-next-single-property-change (point) 'egg-end)))
 	 (decided (buffer-substring start (point)))
 	 (undecided (buffer-substring (point) end))
 	 i len bunsetsu source context)
     (delete-region
      (previous-single-property-change start 'egg-start nil (point-min))
-     (next-single-property-change end 'egg-end nil (point-max)))
+     (egg-next-single-property-change end 'egg-end nil (point-max)))
     (setq i 0
 	  len (length decided))
     (while (< i len)
@@ -1152,11 +1153,11 @@
 		  (previous-single-property-change (point) 'egg-start)))
 	 (end (if (get-text-property (point) 'egg-end)
 		  (point)
-		(next-single-property-change (point) 'egg-end)))
+		(egg-next-single-property-change (point) 'egg-end)))
 	 (bunsetsu (egg-get-bunsetsu-info start)))
     (delete-region
      (previous-single-property-change start 'egg-start nil (point-min))
-     (next-single-property-change end 'egg-end nil (point-max)))
+     (egg-next-single-property-change end 'egg-end nil (point-max)))
     (egg-end-conversion (list bunsetsu) nil)
     (insert (egg-string-to-char-at (egg-get-bunsetsu-converted bunsetsu) 0))))
 
@@ -1164,7 +1165,7 @@
   (interactive)
   (if (egg-conversion-fence-p)
       (progn
-	(goto-char (next-single-property-change (point) 'egg-end))
+	(goto-char (egg-next-single-property-change (point) 'egg-end))
 	(egg-decide-before-point))))
 
 (defun egg-abort-conversion ()
@@ -1178,8 +1179,8 @@
 		'egg-start nil (point-min)))
     (setq source (get-text-property (point) 'egg-source)
 	  context (get-text-property (point) 'egg-context))
-    (delete-region (point) (next-single-property-change
-			    (next-single-property-change (point) 'egg-end)
+    (delete-region (point) (egg-next-single-property-change
+			    (egg-next-single-property-change (point) 'egg-end)
 			    'egg-end nil (point-max)))
     (its-restart source nil nil context)))
 
@@ -1247,4 +1248,5 @@
     (help-setup-xref (cons #'help-xref-mode (current-buffer)) (interactive-p))))
 
 (provide 'egg-cnv)
-;;; egg-cnv.el ends here.
+
+;;; egg-cnv.el ends here
diff -ruwN tamago-4.0.6-canna-20011110/egg-x0213.el tamago/egg-x0213.el
--- tamago-4.0.6-canna-20011110/egg-x0213.el	Thu Jan  1 09:00:00 1970
+++ tamago/egg-x0213.el	Sat Dec  1 18:42:24 2001
@@ -0,0 +1,111 @@
+;;; jisx0213.el --- Charset Definition for JIS X 0213
+
+;; Copyright (C) 1999,2000 PFU LIMITED
+
+;; Author: KATAYAMA Yoshio <kate@pfu.co.jp>
+
+;; Maintainer: TOMURA Satoru <tomura@etl.go.jp>
+
+;; Keywords: mule, multilingual, input method
+
+;; This file is part of EGG.
+
+;; EGG is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; EGG is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; This module defines JIS X 0213 character sets if these character
+;; sets are not defined.  This module also defines fixed-euc-jisx0213
+;; coding systems if these coding systems are not defined and can be
+;; defined.
+
+;;; Code:
+
+(if (not (charsetp 'japanese-jisx0213-1))
+    (define-charset 151 'japanese-jisx0213-1
+      [2 94 2 0 ?O 0 "JISX0213-1" "JISX0213-1" "JISX0213-1 (Japanese)"]))
+
+(if (not (charsetp 'japanese-jisx0213-2))
+    (define-charset 254 'japanese-jisx0213-2
+      [2 94 2 0 ?P 0 "JISX0213-2" "JISX0213-2" "JISX0213-2 (Japanese)"]))
+
+;; Mule-UCS is required to adopt fixed-euc-jisx0213.
+(or 
+ noninteractive ;; unnecessary in non-interactive mode.
+ (unless (or (require 'jisx0213)
+             (get 'jisx0213-to-jisx0208/0212 'translation-table))
+   (message "Mule-UCS not installed."))
+ (coding-system-p 'fixed-euc-jisx0213)
+ (progn
+
+   (define-ccl-program ccl-decode-fixed-euc-jisx0213
+     `(2
+       ((r3 = ,(charset-id 'katakana-jisx0201))
+        (loop ;;      ascii kana 212 208
+         (read r0) ;; r0 -   0    0    h   h
+         (read r1) ;; r1 -   l    h    l   h
+         (if (r0 < ?\x80)
+             ((if (r1 < ?\x80)
+                  (write-repeat r1))
+              (write r3)
+              (write-repeat r1))
+           ((r0 &= 127)
+            (r0 <<= 7)
+            (if (r1 > ?\x80)
+                ((r1 &= 127)
+                 (r2 = ,(charset-id 'japanese-jisx0213-1)))
+              (r2 = ,(charset-id 'japanese-jisx0213-2)))
+            (r0 += r1)
+            (translate-character jisx0213-to-jisx0208/0212 r2 r0)
+            (write-multibyte-character r2 r0)
+            (repeat)
+            ))))))
+
+   (define-ccl-program ccl-encode-fixed-euc-jisx0213
+     `(2
+       ((loop
+         (read-multibyte-character r0 r1)
+         (r6 = (r0 == ,(charset-id 'ascii))) ;G0
+         (r6 |= (r0 == ,(charset-id 'latin-jisx0201)))
+         (if r6
+             ((write 0)
+              (write-repeat r1)))
+         (r6 = (r0 == ,(charset-id 'japanese-jisx0208)))
+         (r6 |= (r0 == ,(charset-id 'japanese-jisx0208-1978)))
+         (r6 |= (r0 == ,(charset-id 'japanese-jisx0213-1)))
+         (if r6                         ;G1
+             ((r2 = (r1 >> 7))
+              (write (r2 | ?\x80))
+              (write ((r1 & ?\x7f) | ?\x80))
+              (repeat)))
+         (if (r0 == ,(charset-id 'katakana-jisx0201)) ;G2
+             ((write 0)
+              (write (r1 | ?\x80))
+              (repeat)))
+         (r6 = (r0 == ,(charset-id 'japanese-jisx0212))) ;G3
+         (r6 |= (r0 == ,(charset-id 'japanese-jisx0213-2)))
+         (if r6
+             ((r2 = (r1 >> 7))
+              (write (r2 | ?\x80))
+              (write (r1 & ?\x7f))
+              (repeat)))
+         (repeat)))))
+
+   (make-coding-system 
+    'fixed-euc-jisx0213 4 ?W "Coding System for fixed EUC Japanese"
+    (cons ccl-decode-fixed-euc-jisx0213 ccl-encode-fixed-euc-jisx0213))))
+
+(provide 'egg-x0213)
diff -ruwN tamago-4.0.6-canna-20011110/egg.el tamago/egg.el
--- tamago-4.0.6-canna-20011110/egg.el	Tue Oct 23 21:45:17 2001
+++ tamago/egg.el	Tue Dec  4 16:47:01 2001
@@ -30,7 +30,12 @@
 
 ;;; Code:
 
-(require 'cl)
+(defconst egg-version "4.0.6"
+  "Version number for this version of Tamago.")
+
+(eval-when-compile
+  (require 'cl))
+
 (require 'egg-edep)
 
 (autoload 'egg-simple-input-method "egg-sim"
@@ -45,7 +50,7 @@
 
 (defvar egg-default-language)
 
-(defvar egg-last-method-name)
+(defvar egg-last-method-name nil)
 (make-variable-buffer-local 'egg-last-method-name)
 (put 'egg-last-method-name 'permanent-local t)
 
@@ -193,6 +198,13 @@
       (setq p (next-property-change p object to)))
     (remove-text-properties from to props object)))
 
+(defun egg-setup-invisibility-spec ()
+  (if (listp buffer-invisibility-spec)
+      (unless (condition-case nil (memq 'egg buffer-invisibility-spec) (error))
+	(setq buffer-invisibility-spec (cons 'egg buffer-invisibility-spec)))
+    (unless (eq buffer-invisibility-spec t)
+      (setq buffer-invisibility-spec (list 'egg buffer-invisibility-spec)))))
+
 (defvar egg-mark-list nil)
 (defvar egg-suppress-marking nil)
 
diff -ruwN tamago-4.0.6-canna-20011110/eggrc tamago/eggrc
--- tamago-4.0.6-canna-20011110/eggrc	Tue Oct 17 01:45:46 2000
+++ tamago/eggrc	Tue Dec  4 16:47:01 2001
@@ -107,6 +107,93 @@
   (wnn-add-dict '("ud") "" 15 t t)
   (wnn-set-param  2 10 2 45 1 80 5 1 50 -20 400 -10  100  -100 200 0 200))
 
+(defun wnn7-jserver-setup ()
+  (wnn-define-environment nil)
+  (wnn-set-fuzokugo "system/kougo.fzk")
+  (wnn-add-fisys-dict "system/fisd" '("fisd.h") t)
+  (wnn-add-fiusr-dict '("fiud") nil t nil)
+
+  (wnn-add-dict "system/kihon.dic"        '("kihon.h")       6 nil t)
+  (wnn-add-dict "system/symbol.dic"       '("symbol.h")      1 nil t)
+  (wnn-add-dict "system/symbol_noat.dic"  '("symbol_noat.h") 1 nil t)
+  (wnn-add-dict "system/tel.dic"          '("tel.h")         1 nil t)
+  (wnn-add-dict "system/zip.dic"          '("zip.h")         1 nil t)
+  (wnn-add-dict "system/tankan.dic"       nil                1 nil nil)
+  (wnn-add-dict "system/tankan2.dic"      nil                1 nil nil)
+  (wnn-add-dict "system/ikeiji.dic"       nil                1 nil nil)
+  (wnn-add-dict "system/rensou.dic"       nil                1 nil nil)
+  (wnn-add-dict '("ud")                   nil               15 t   t)
+
+  (wnn-add-dict "option/jinmei.dic"       '("jinmei.h")      1 nil t)
+  (wnn-add-dict "option/chimei.dic"       '("chimei.h")      1 nil t)
+  (wnn-add-dict "option/address.dic"      '("address.h")     1 nil t)
+  (wnn-add-dict "option/station.dic"      '("station.h")     1 nil t)
+  (wnn-add-dict "option/kana_english.dic" '("kana_english.h")1 nil t)
+  (wnn-add-dict "option/enterprise.dic"   '("enterprise.h")  1 nil t)
+  (wnn-add-dict "option/airport.dic"      '("airport.h")     1 nil t)
+  (wnn-add-dict "option/university.dic"   '("university.h")  1 nil t)
+  (wnn-add-dict "option/zoo.dic"          '("zoo.h")         1 nil t)
+  (wnn-add-dict "option/botanical_garden.dic" '("botanical_garden.h") 1 nil t)
+  (wnn-add-dict "option/aquarium.dic"     '("aquarium.h")    1 nil t)
+  (wnn-add-dict "option/conveni.dic"      '("conveni.h")     1 nil t)
+  (wnn-add-dict "option/amusement.dic"    '("amusement.h")   1 nil t)
+
+  (wnn-set-param  5 10 2 45 0  80 5 1 20  0 400 -100 400   80 200 2 200)
+
+  (wnn-add-notrans-dict '("katakana") 15 t)
+  (wnn-add-bmodify-dict '("bunsetsu") 15 t)
+
+  (wnn-set-last-is-first-mode t)
+  (wnn-set-complex-conv-mode nil)
+  ;; (wnn-set-okuri-flag -1)
+  (wnn-set-prefix-flag 0)
+
+  (wnn-set-okuri-learn-mode t)
+  (wnn-set-prefix-learn-mode t)
+  (wnn-set-suffix-learn-mode t)
+  (wnn-set-common-learn-mode t)
+  (wnn-set-yuragi-mode nil)
+
+  (wnn-set-freq-func-mode 4)
+
+;;  (wnn-set-yosoku-learn t)
+;;  (wnn-set-yosoku-max-disp 10)
+;;  (wnn-set-yosoku-last-is-first t)
+
+;;  (wnn-set-boin-kabusoku t)
+;;  (wnn-set-shiin-choka t)
+;;  (wnn-set-n-choka t)
+;;  (wnn-set-nihongo-kosei t)
+
+  ;; (wnn-set-numeric-mode -12)
+  ;; (wnn-set-alphabet-mode -30)
+  ;; (wnn-set-symbol-mode -40)
+
+  (wnn-define-environment t)
+  (wnn-set-fuzokugo "system/kougo.fzk")
+  (wnn-add-dict "system/kihonR.dic" nil 1 nil nil)
+  (wnn-add-dict "system/telR.dic" nil 1 nil nil)
+  (wnn-add-dict "system/zipR.dic" nil 1 nil nil)
+  (wnn-add-dict "system/tankanR.dic" nil 1 nil nil)
+  (wnn-add-dict "system/tankan2R.dic" nil 1 nil nil)
+
+  (wnn-add-dict "option/jinmeiR.dic" nil 1 nil nil)
+  (wnn-add-dict "option/chimeiR.dic" nil 1 nil nil)
+  (wnn-add-dict "option/addressR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/stationR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/kana_englishR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/enterpriseR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/airportR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/universityR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/zooR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/botanical_gardenR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/aquariumR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/conveniR.dic" nil 1 nil nil)
+  ;;(wnn-add-dict "option/amusementR.dic" nil 1 nil nil)
+
+  (wnn-add-dict '("ud") nil 15 t t)
+  (wnn-set-param  2 10 2 45 1 80 5 1 50 -20 400 -10  100  -100 200 0 200))
+
 (cond
  ((eq egg-backend-type 'wnn)
   (cond
diff -ruwN tamago-4.0.6-canna-20011110/its/aynu.el tamago/its/aynu.el
--- tamago-4.0.6-canna-20011110/its/aynu.el	Tue Oct 23 21:45:18 2001
+++ tamago/its/aynu.el	Tue Dec  4 16:47:01 2001
@@ -30,7 +30,9 @@
 
 ;;; Code:
 
+(eval-when-compile
 (require 'its)
+  (require 'cl))
 
 (eval-when (compile)
   (defconst its-compaction-enable t))
@@ -279,4 +281,5 @@
       (its-defrule   "?"   "?")  (its-defrule   "/"   "/"))))
 
 (provide 'its/aynu)
-;;; its/aynu.el ends here.
+
+;;; its/aynu.el ends here
diff -ruwN tamago-4.0.6-canna-20011110/its/greek.el tamago/its/greek.el
--- tamago-4.0.6-canna-20011110/its/greek.el	Thu Jan  1 09:00:00 1970
+++ tamago/its/greek.el	Mon Aug 20 19:09:07 2001
@@ -0,0 +1,251 @@
+(eval-when-compile
+  (require 'its)
+  (require 'cl))
+
+(eval-when (compile)
+  (defconst its-compaction-enable t))
+
+(defgroup greek nil
+  "Greek Input Method"
+  :group 'its)
+
+(define-its-state-machine its-greek-jis-map
+ "greek-jis" "Ω" Greek
+ "Ελληνικα: Greek keyboard layout (JIS X0208.1983)
+
+The layout is same as greek, but uses JIS characters.
+Sorry, accents and terminal sigma are not supported in JIS."
+
+ (its-defrule "1"  "１")
+ (its-defrule "2"  "２")
+ (its-defrule "3"  "３")
+ (its-defrule "4"  "４")
+ (its-defrule "5"  "５")
+ (its-defrule "6"  "６")
+ (its-defrule "7"  "７")
+ (its-defrule "8"  "８")
+ (its-defrule "9"  "９")
+ (its-defrule "0"  "０")
+ (its-defrule "-"  "−")
+ (its-defrule "="  "＝")
+ (its-defrule "`"  "‘")
+ (its-defrule "q"  "・")
+ (its-defrule "w"  "σ")
+ (its-defrule "e"  "ε")
+ (its-defrule "r"  "ρ")
+ (its-defrule "t"  "τ")
+ (its-defrule "y"  "υ")
+ (its-defrule "u"  "θ")
+ (its-defrule "i"  "ι")
+ (its-defrule "o"  "ο")
+ (its-defrule "p"  "π")
+ (its-defrule "["  "［")
+ (its-defrule "]"  "］")
+ (its-defrule "a"  "α")
+ (its-defrule "s"  "σ")
+ (its-defrule "d"  "δ")
+ (its-defrule "f"  "φ")
+ (its-defrule "g"  "γ")
+ (its-defrule "h"  "η")
+ (its-defrule "j"  "ξ")
+ (its-defrule "k"  "κ")
+ (its-defrule "l"  "λ")
+ (its-defrule ";"  "’")
+ (its-defrule "'"  "’")
+ (its-defrule "\\" "＼")
+ (its-defrule "z"  "ζ")
+ (its-defrule "x"  "χ")
+ (its-defrule "c"  "ψ")
+ (its-defrule "v"  "ω")
+ (its-defrule "b"  "β")
+ (its-defrule "n"  "ν")
+ (its-defrule "m"  "μ")
+ (its-defrule ","  ", ")
+ (its-defrule "."  ". ")
+ (its-defrule "/"  "／")
+  
+ (its-defrule "!"  "！")
+ (its-defrule "@"  "＠")
+ (its-defrule "#"  "＃")
+ (its-defrule "$"  "＃")
+ (its-defrule "%"  "％")
+ (its-defrule "^"  "＾")
+ (its-defrule "&"  "＆")
+ (its-defrule "*"  "＊")
+ (its-defrule "("  "（")
+ (its-defrule ")"  "）")
+ (its-defrule "_"  "＿")
+ (its-defrule "+"  "＋")
+ (its-defrule "~"  "￣")
+ (its-defrule "Q"  "−")
+ (its-defrule "W"  "Σ")
+ (its-defrule "E"  "Ε")
+ (its-defrule "R"  "Ρ")
+ (its-defrule "T"  "Τ")
+ (its-defrule "Y"  "Υ")
+ (its-defrule "U"  "Θ")
+ (its-defrule "I"  "Ι")
+ (its-defrule "O"  "Ο")
+ (its-defrule "P"  "Ρ")
+ (its-defrule "{"  "｛")
+ (its-defrule "}"  "｝")
+ (its-defrule "A"  "Α")
+ (its-defrule "S"  "Σ")
+ (its-defrule "D"  "Δ")
+ (its-defrule "F"  "Φ")
+ (its-defrule "G"  "Γ")
+ (its-defrule "H"  "Η")
+ (its-defrule "J"  "Ξ")
+ (its-defrule "K"  "Κ")
+ (its-defrule "L"  "Λ")
+ (its-defrule ":"  "”")
+ (its-defrule "\"" "”")
+ (its-defrule "|"  "｜")
+ (its-defrule "Z"  "Ζ")
+ (its-defrule "X"  "Χ")
+ (its-defrule "C"  "Ψ")
+ (its-defrule "V"  "Ω")
+ (its-defrule "B"  "Β")
+ (its-defrule "N"  "Ν")
+ (its-defrule "M"  "Μ")
+ (its-defrule "<"  "；")
+ (its-defrule ">"  "：")
+ (its-defrule "?"  "？"))
+
+(define-its-state-machine its-greek-map
+ "greek" ",FY" Greek
+ ",FEkkgmij\: Greek keyboard layout (ISO 8859-7)
+--------------
+
+In the right of ,Fk key is a combination key, where
+ ,F4 acute
+ ,F( diaresis
+
+e.g.
+ ,Fa + ,F4 -> ,F\
+ ,Fi + ,F( -> ,Fz
+ ,Fi + ,F( + ,F4 -> ,F@"
+
+;; 1!  2@  3#  4$  5%  6^  7&  8*  9(  0)  -_  =+  `~
+;;  ,F7/  ,FrS  ,FeE  ,FqQ  ,FtT  ,FuU  ,FhH  ,FiI  ,FoO  ,FpP  [{  ]}
+;;   ,FaA  ,FsS  ,FdD  ,FvV  ,FcC  ,FgG  ,FnN  ,FjJ  ,FkK  ,F4(  '"  \|
+;;    ,FfF  ,FwW  ,FxX  ,FyY  ,FbB  ,FmM  ,FlL  ,;  .:  /?  
+
+ (its-defrule "1"   "1")
+ (its-defrule "2"   "2")
+ (its-defrule "3"   "3")
+ (its-defrule "4"   "4")
+ (its-defrule "5"   "5")
+ (its-defrule "6"   "6")
+ (its-defrule "7"   "7")
+ (its-defrule "8"   "8")
+ (its-defrule "9"   "9")
+ (its-defrule "0"   "0")
+ (its-defrule "-"   "-")
+ (its-defrule "="   "=")
+ (its-defrule "`"   "`")
+ (its-defrule "q"   ",F7")
+ (its-defrule "w"   ",Fr")
+ (its-defrule "e"   ",Fe")
+ (its-defrule "r"   ",Fq")
+ (its-defrule "t"   ",Ft")
+ (its-defrule "y"   ",Fu")
+ (its-defrule "u"   ",Fh")
+ (its-defrule "i"   ",Fi")
+ (its-defrule "o"   ",Fo")
+ (its-defrule "p"   ",Fp")
+ (its-defrule "["   "[")
+ (its-defrule "]"   "]")
+ (its-defrule "a"   ",Fa")
+ (its-defrule "s"   ",Fs")
+ (its-defrule "d"   ",Fd")
+ (its-defrule "f"   ",Fv")
+ (its-defrule "g"   ",Fc")
+ (its-defrule "h"   ",Fg")
+ (its-defrule "j"   ",Fn")
+ (its-defrule "k"   ",Fj")
+ (its-defrule "l"   ",Fk")
+ (its-defrule ";"   ",F4")
+ (its-defrule "'"   "'")
+ (its-defrule "\\"  "\\")
+ (its-defrule "z"   ",Ff")
+ (its-defrule "x"   ",Fw")
+ (its-defrule "c"   ",Fx")
+ (its-defrule "v"   ",Fy")
+ (its-defrule "b"   ",Fb")
+ (its-defrule "n"   ",Fm")
+ (its-defrule "m"   ",Fl")
+ (its-defrule ","   ",")
+ (its-defrule "."   ".")
+ (its-defrule "/"   "/")
+ 
+ (its-defrule "!"   "!")
+ (its-defrule "@"   "@")
+ (its-defrule "#"   "#")
+ (its-defrule "$"   "$")
+ (its-defrule "%"   "%")
+ (its-defrule "^"   "^")
+ (its-defrule "&"   "&")
+ (its-defrule "*"   "*")
+ (its-defrule "("   "(")
+ (its-defrule ")"   ")")
+ (its-defrule "_"   "_")
+ (its-defrule "+"   "+")
+ (its-defrule "~"   "~")
+ (its-defrule "Q"   ",F/")
+ (its-defrule "W"   ",FS")
+ (its-defrule "E"   ",FE")
+ (its-defrule "R"   ",FQ")
+ (its-defrule "T"   ",FT")
+ (its-defrule "Y"   ",FU")
+ (its-defrule "U"   ",FH")
+ (its-defrule "I"   ",FI")
+ (its-defrule "O"   ",FO")
+ (its-defrule "P"   ",FP")
+ (its-defrule "{"   "{")
+ (its-defrule "}"   "}")
+ (its-defrule "A"   ",FA")
+ (its-defrule "S"   ",FS")
+ (its-defrule "D"   ",FD")
+ (its-defrule "F"   ",FV")
+ (its-defrule "G"   ",FC")
+ (its-defrule "H"   ",FG")
+ (its-defrule "J"   ",FN")
+ (its-defrule "K"   ",FJ")
+ (its-defrule "L"   ",FK")
+ (its-defrule ":"   ",F(")
+ (its-defrule "\""  "\"")
+ (its-defrule "|"   "|")
+ (its-defrule "Z"   ",FF")
+ (its-defrule "X"   ",FW")
+ (its-defrule "C"   ",FX")
+ (its-defrule "V"   ",FY")
+ (its-defrule "B"   ",FB")
+ (its-defrule "N"   ",FM")
+ (its-defrule "M"   ",FL")
+ (its-defrule "<"   ";")
+ (its-defrule ">"   ":")
+ (its-defrule "?"   "?")
+ 
+ (its-defrule "a;"  ",F\")
+ (its-defrule "e;"  ",F]")
+ (its-defrule "h;"  ",F^")
+ (its-defrule "i;"  ",F_")
+ (its-defrule "o;"  ",F|")
+ (its-defrule "y;"  ",F}")
+ (its-defrule "v;"  ",F~")
+ (its-defrule "A;"  ",F6")
+ (its-defrule "E;"  ",F8")
+ (its-defrule "H;"  ",F9")
+ (its-defrule "I;"  ",F:")
+ (its-defrule "O;"  ",F<")
+ (its-defrule "Y;"  ",F>")
+ (its-defrule "V;"  ",F?")
+ (its-defrule "i:"  ",Fz")
+ (its-defrule "y:"  ",F{")
+ (its-defrule "I:"  ",FZ")
+ (its-defrule "Y:"  ",F[")
+ (its-defrule "i:;" ",F@")
+ (its-defrule "y:;" ",F`"))
+
+(provide 'its/greek)
diff -ruwN tamago-4.0.6-canna-20011110/its-keydef.el tamago/its-keydef.el
--- tamago-4.0.6-canna-20011110/its-keydef.el	Tue Oct 23 21:45:19 2001
+++ tamago/its-keydef.el	Tue Dec  4 16:47:01 2001
@@ -43,6 +43,7 @@
 
 (defvar its-select-alist nil)
 (make-variable-buffer-local 'its-select-func-alist)
+(setq-default its-select-func-alist nil)
 (put 'its-select-alist 'permanent-local t)
 
 (defvar its-select-func-default-alist nil)
diff -ruwN tamago-4.0.6-canna-20011110/its.el tamago/its.el
--- tamago-4.0.6-canna-20011110/its.el	Tue Oct 23 21:45:20 2001
+++ tamago/its.el	Tue Dec  4 16:47:01 2001
@@ -31,7 +31,9 @@
 
 ;;; Code:
 
-(require 'cl)
+(eval-when-compile
+  (require 'cl))
+
 (require 'egg-edep)
 
 (defgroup its nil
@@ -47,7 +49,13 @@
   :group 'its :type 'boolean)
 
 (defcustom its-delete-by-keystroke nil
-  "*Delete characters as if cancel input keystroke, if nin-NIL."
+  "*Delete characters as if cancel input keystroke, if nin-NIL.
+This variable is overriden by `its-delete-by-character'."
+  :group 'its :type 'boolean)
+
+(defcustom its-delete-by-character nil
+  "*Delete a character as a unit even if just after input, if nin-NIL.
+This variable override `its-delete-by-keystroke'."
   :group 'its :type 'boolean)
 
 (defcustom its-fence-invisible nil
@@ -93,7 +101,7 @@
 (make-variable-buffer-local 'its-previous-select-func)
 (put 'its-previous-select-func 'permanent-local t)
 
-(defvar its-current-language)
+(defvar its-current-language nil)
 (make-variable-buffer-local 'its-current-language)
 (put 'its-current-language 'permanent-local t)
 
@@ -267,8 +275,8 @@
     (define-key map "\M-y" 'its-yank-pop)
     (define-key map [backspace] 'its-delete-backward-SYL)
     (define-key map [delete] 'its-delete-backward-SYL)
-    (define-key map [M-backspace] 'its-delete-backward-SYL-by-keystroke)
-    (define-key map [M-delete] 'its-delete-backward-SYL-by-keystroke)
+    (define-key map [(meta backspace)] 'its-delete-backward-SYL-by-keystroke)
+    (define-key map [(meta delete)] 'its-delete-backward-SYL-by-keystroke)
     (define-key map [right] 'its-forward-SYL)
     (define-key map [left] 'its-backward-SYL)
     (while (< i 127)
@@ -314,7 +322,7 @@
       (let ((p (point))
 	    (str (copy-sequence "!")))
       (set-text-properties 0 1 (list 'read-only          t
-				       'invisible t
+				     'invisible          'egg
 				       'intangible 'its-part-2
 				     'its-cursor         cursor
 				     'point-entered      'egg-enter/leave-fence
@@ -352,6 +360,7 @@
 	(error "invalid fence"))
     ;; Put open-fence before inhibit-read-only to detect read-only
     (insert (if its-context its-fence-continue its-fence-open))
+    (egg-setup-invisibility-spec)
     (let ((inhibit-read-only t))
       (setq p1 (point))
       (add-text-properties p p1 open-props)
@@ -360,7 +369,7 @@
       (insert its-fence-close)
       (add-text-properties p1 (point) close-props)
       (if its-fence-invisible
-	  (put-text-property p (point) 'invisible t))
+	  (put-text-property p (point) 'invisible 'egg))
       (put-text-property p (point) 'read-only t)
       (goto-char p1)
       (its-define-select-keys its-mode-map t)
@@ -1010,7 +1019,7 @@
 	(cursor (get-text-property (point) 'its-cursor)))
     (if (null syl)
 	(signal 'beginning-of-buffer nil)
-      (if (eq cursor t)
+      (if (or (eq cursor t) (and cursor its-delete-by-character))
 	  (its-delete-backward-SYL-internal n killflag)
 	(its-delete-backward-within-SYL syl n killflag)))))
 
@@ -1548,4 +1557,5 @@
     (help-setup-xref (cons #'help-xref-mode (current-buffer)) (interactive-p))))
 
 (provide 'its)
-;;; its.el ends here.
+
+;;; its.el ends here
diff -ruwN tamago-4.0.6-canna-20011110/jisx0213.el tamago/jisx0213.el
--- tamago-4.0.6-canna-20011110/jisx0213.el	Tue Oct 23 21:45:20 2001
+++ tamago/jisx0213.el	Tue Jul 10 06:53:45 2001
@@ -30,10 +30,10 @@
 
 ;;; Code:
 
-(if (not (charsetp 'japanese-jisx0213-1))
+(unless (charsetp 'japanese-jisx0213-1)
     (define-charset 151 'japanese-jisx0213-1
       [2 94 2 0 ?O 0 "JISX0213-1" "JISX0213-1" "JISX0213-1 (Japanese)"]))
 
-(if (not (charsetp 'japanese-jisx0213-2))
+(unless (charsetp 'japanese-jisx0213-2)
     (define-charset 254 'japanese-jisx0213-2
       [2 94 2 0 ?P 0 "JISX0213-2" "JISX0213-2" "JISX0213-2 (Japanese)"]))