--- egg-4.0.6+0.20041122cvs.orig/Makefile.in
+++ egg-4.0.6+0.20041122cvs/Makefile.in
@@ -55,6 +55,7 @@
 	menudiag.el \
 	its.el \
 	its-keydef.el \
+	leim-list.el \
 
 #
 EGGSRCS	= \
@@ -74,6 +75,7 @@
 	its/hankata.el \
 	its/hira.el \
 	its/jeonkak.el \
+        its/greek.el \
 	its/pinyin.el \
 	its/hangul.el \
 	its/kata.el \
--- egg-4.0.6+0.20041122cvs.orig/egg/canna.el
+++ egg-4.0.6+0.20041122cvs/egg/canna.el
@@ -37,11 +37,11 @@
   "CANNA interface for Tamago 4."
   :group 'egg)
 
-(defcustom canna-hostname "localhost"
+(defcustom canna-hostname "unix/"
   "Hostname of CANNA server"
   :group 'canna :type 'string)
 
-(defcustom canna-server-port "canna"
+(defcustom canna-server-port "/tmp/.iroha_unix/IROHA"
   "A service name or a port number (should be a string) of CANNA server"
   :group 'canna :type 'string)
 
@@ -53,6 +53,10 @@
   "Group Name on CANNA server"
   :group 'canna :type 'string)
 
+(defcustom egg-canna-helper-path "egg-helper"
+  "path of canna unix domain connection helper program"
+  :group 'canna :type 'file)
+
 ; (eval-when-compile
 ;   (defmacro CANNA-const (c)
 ;     (cond ((eq c 'FileNotExist) xxxxxxxxxxxxxx)
@@ -326,14 +330,23 @@
 	  (while (and hostname-list (null proc))
 	    (setq hostname (or (car hostname-list) "")
 		  hostname-list (cdr hostname-list))
-	    (if (null (string-match ":" hostname))
-		(setq port canna-server-port)
-	      (setq port (substring hostname (match-end 0))
-		    hostname (substring hostname 0 (match-beginning 0))))
-	    (if (and (stringp port) (string-match "^[0-9]+$" port))
-		(setq port (string-to-int port)))
-	    (and (equal hostname "")
-		 (setq hostname (or (getenv "CANNAHOST") "localhost")))
+	    (if (null (string-match "^unix/" hostname))
+		(progn
+		  (if (null (string-match ":" hostname))
+		      (setq port canna-server-port)
+		    (setq port (substring hostname (match-end 0))
+			  hostname (substring hostname 0 (match-beginning 0))))
+		  (if (and (stringp port) (string-match "^[0-9]+$" port))
+		      (setq port (string-to-int port)))
+		  (and (equal hostname "")
+		       (setq hostname (or (getenv "CANNAHOST") "localhost")))
+		  (setq host hostname)
+		  (setq family nil))
+	      (setq family 'local)
+	      (setq host nil)
+	      (setq port canna-server-port)
+	      (if (null (and (stringp port) (string-match "IROHA$" port)))
+		  (setq port "/tmp/.iroha_unix/IROHA")))
 	    (let ((inhibit-quit save-inhibit-quit))
 	      (if (and msg
 		       (null (y-or-n-p (format "%s failed. Try to %s? "
@@ -342,10 +355,18 @@
 	    (setq msg (format "Canna: connecting to %s..." hostname))
 	    (message "%s" msg)
 	    (let ((inhibit-quit save-inhibit-quit))
-	      (condition-case nil
-		  (setq proc (open-network-stream proc-name buf hostname port))
-		((error quit))))
-	    (when proc
+	      (if (fboundp 'make-network-process)
+		  (condition-case nil
+		      (setq proc (make-network-process :name proc-name :buffer buf :host host :service port :family family))
+		    ((error quit)))
+		; for old emacs (<= 21.3) bellow
+		(if (string-match "^unix/" hostname)
+		    (let ((process-connection-type nil))
+		      (setq proc (start-process proc-name buf egg-canna-helper-path port)))
+		  (condition-case nil
+		      (setq proc (open-network-stream proc-name buf hostname port))
+		    (error quit)))))
+	    (when (processp proc)
 	      (process-kill-without-query proc)
 	      (set-process-coding-system proc 'binary 'binary)
 	      (set-process-sentinel proc 'canna-comm-sentinel)
@@ -353,7 +374,7 @@
 	      (setq result (cannarpc-open proc user-name)) ;; result is context
 	      (if (= result -1)
 		  (progn
-	  (delete-process proc)
+		    (delete-process proc)
 		    (setq proc nil))
 		(cannarpc-notice-group-name proc result group)
 		(cannarpc-set-app-name proc result "EGG4"))))
@@ -632,7 +653,7 @@
     (unless (eq action 'save-only)
       (while proc-list
 	(if (and (car proc-list)
-		 (eq (process-status (car proc-list)) 'open))
+		 (memq (process-status (car proc-list)) '(open run)))
 	    (cannarpc-close (car proc-list)))
 	(setq proc-list (cdr proc-list)))))
   (setq canna-environments nil))
--- egg-4.0.6+0.20041122cvs.orig/egg/wnnrpc.el
+++ egg-4.0.6+0.20041122cvs/egg/wnnrpc.el
@@ -126,8 +126,30 @@
 	  ((eq c 'JS_FI_DIC_LIST_ALL)         ?\xf00082)
 	  ((eq c 'JS_FUZOKUGO_LIST)           ?\xf00083)
 
+	  ((eq c 'JS_YOSOKU_INIT)                 ?\xf01001)
+	  ((eq c 'JS_YOSOKU_FREE)                 ?\xf01002)
+	  ((eq c 'JS_YOSOKU_YOSOKU)               ?\xf01003)
+	  ((eq c 'JS_YOSOKU_TOROKU)               ?\xf01004)
+	  ((eq c 'JS_YOSOKU_SELECTED_CAND)        ?\xf01005)
+	  ((eq c 'JS_YOSOKU_DELETE_CAND)          ?\xf01006)
+	  ((eq c 'JS_YOSOKU_CANCEL_LATEST_TOROKU) ?\xf01007)
+	  ((eq c 'JS_YOSOKU_RESET_PRE_YOSOKU)     ?\xf01008)
+	  ((eq c 'JS_YOSOKU_IKKATSU_TOROKU)       ?\xf01009)
+	  ((eq c 'JS_YOSOKU_SAVE_DATALIST)        ?\xf0100a)
+	  ((eq c 'JS_YOSOKU_INIT_TIME_KEYDATA)    ?\xf0100b)
+	  ((eq c 'JS_YOSOKU_INIT_INPUTINFO)       ?\xf0100c)
+	  ((eq c 'JS_YOSOKU_SET_USER_INPUTINFO)   ?\xf0100d)
+	  ((eq c 'JS_YOSOKU_SET_TIMEINFO)         ?\xf0100e)
+	  ((eq c 'JS_YOSOKU_STATUS)               ?\xf0100f)
+	  ((eq c 'JS_YOSOKU_SET_PARAM)            ?\xf01010)
+	  ((eq c 'JS_YOSOKU_IKKATSU_TOROKU_INIT)  ?\xf01011)
+	  ((eq c 'JS_YOSOKU_IKKATSU_TOROKU_END)   ?\xf01012)
+	  ((eq c 'JS_HENKAN_ASSOC)                ?\xf01013)
+
 	  ((eq c 'JLIB_VERSION)       ?\x4003)
 	  ((eq c 'JLIB_VERSION_WNN6)  ?\x4f00)
+	  ((eq c 'JLIB_VERSION_WNN7)  ?\x4f01)
+	  ((eq c 'JLIB_VERSION_WNN8)  ?\x4f02)
 
 	  ((eq c 'WNN_C_LOCAL)            "!")
 	  ((eq c 'WNN_FT_DICT_FILE)         1)
@@ -693,10 +715,10 @@
 
 (defmacro wnnrpc-get-result (&rest body)
   `(let (result)
-     (comm-unpack (i) result)
+     (comm-unpack (u) result)
      (if (< result 0)
        (progn
-	 (comm-unpack (i) result)
+	 (comm-unpack (u) result)
 	 (- result))
      ,@(or body '(result)))))
 
@@ -709,8 +731,10 @@
     (wnnrpc-get-result)))
 
 (defun wnnrpc-open (proc myhostname username)
-  "Open the session.  Return wnn4 or wnn6 on success, NIL on failure."
-  (let ((type-list `((wnn6 . ,(wnn-const JLIB_VERSION_WNN6))
+  "Open the session.  Return wnn4/wnn6/wnn7 or wnn8 on success, NIL on failure."
+  (let ((type-list `((wnn8 . ,(wnn-const JLIB_VERSION_WNN8))
+		     (wnn7 . ,(wnn-const JLIB_VERSION_WNN7))
+		     (wnn6 . ,(wnn-const JLIB_VERSION_WNN6))
 		     (wnn4 . ,(wnn-const JLIB_VERSION))))
 	(result (- (wnn-const WNN_BAD_VERSION)))
 	type version)
@@ -798,7 +822,7 @@
   "Return the version number of WNN server."
   (comm-call-with-proc proc (result)
     (comm-format (u) (wnn-const JS_VERSION))
-    (comm-unpack (i) result)
+    (comm-unpack (u) result)
     result))
 
 (defun wnnrpc-access (env path mode)
@@ -807,7 +831,7 @@
 can be accessed in mode MODE.  Return Non-zero otherwise."
   (wnnrpc-call-with-environment env (result)
     (comm-format (u u u s) (wnn-const JS_ACCESS) env-id mode path)
-    (comm-unpack (i) result)
+    (comm-unpack (u) result)
     result))
 
 (defun wnnrpc-mkdir (env path)
@@ -882,6 +906,38 @@
 		 (aref v 15) (aref v 16) (aref v 17))
     (wnnrpc-get-result)))
 
+(defun wnn7rpc-set-conversion-env-param (env mask v)
+  "Set Wnn7 conversion parameter."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u u i i i i i i i i i i i i i i i i i i i i i i i i)
+                 (wnn-const JS_SET_HENKAN_ENV)
+                 env-id mask
+                 (aref v  0) (aref v  1) (aref v  2) (aref v  3) (aref v  4)
+                 (aref v  5) (aref v  6) (aref v  7) (aref v  8) (aref v  9)
+                 (aref v 10) (aref v 11) (aref v 12) (aref v 13) (aref v 14)
+                 (aref v 15) (aref v 16) (aref v 17) 
+		 ;; (aref v 18)
+		 ;; (aref v 19)
+                 ;; (aref v 20)
+		 ;; (aref v 21)
+		 ;; (aref v 22)
+		 ;; (aref v 23))
+		 0 10 0 0 0 0)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-set-conversion-env-param-highbit (env maskh maskl v)
+  "Set Wnn7 conversion parameter (use high bit mask)."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u w w i i i i i i i i i i i i i i i i i i i i i i i i)
+                 (wnn-const JS_SET_HENKAN_ENV)
+                 env-id maskh maskl
+                 (aref v  0) (aref v  1) (aref v  2) (aref v  3) (aref v  4)
+                 (aref v  5) (aref v  6) (aref v  7) (aref v  8) (aref v  9)
+                 (aref v 10) (aref v 11) (aref v 12) (aref v 13) (aref v 14)
+                 (aref v 15) (aref v 16) (aref v 17) (aref v 18) (aref v 19)
+                 (aref v 20) (aref v 21) (aref v 22) (aref v 23))
+    (wnnrpc-get-result)))
+
 (defun wnnrpc-temporary-dic-loaded (env)
   "Ask to the server whether the temporary dictionary is loaded or not.
 Return positive if loaded, zero if not, negative on failure."
@@ -904,7 +960,7 @@
 	hinshi status status-backward kangovect evaluation
 	result source fuzokugo)
     (while (> n-bunsetsu 0)
-      (comm-unpack (i i i i i i i i i i i i)
+      (comm-unpack (u u u u u u u u u u u u)
 		   end start jiritsugo-end
 		   dic-no entry freq right-now hinshi
 		   status status-backward kangovect evaluation)
@@ -929,9 +985,9 @@
 	n-bunstsu kanji-length dlist slist
 	end start n-sho evaluation
 	n retval)
-    (comm-unpack (i i) n-bunstsu kanji-length)
+    (comm-unpack (u u) n-bunstsu kanji-length)
     (while (> n-dai 0)
-      (comm-unpack (i i i i) end start n-sho evaluation)
+      (comm-unpack (u u u u) end start n-sho evaluation)
       (setq dlist (cons (cons n-sho evaluation) dlist)
 	    n-dai (1- n-dai)))
     (setq dlist (nreverse dlist)
@@ -1010,7 +1066,7 @@
 	fi-dic dic entry offset num result)
     (comm-unpack (i) num)
     (while (> num 0)
-      (comm-unpack (i i i i) fi-dic dic entry offset)
+      (comm-unpack (u u u u) fi-dic dic entry offset)
       (setq result (cons (vector fi-dic dic entry offset -2 -4) result)
 	    num (1- num)))
     (nreverse result)))
@@ -1110,7 +1166,7 @@
   ""
   (comm-call-with-proc proc (result)
     (comm-format (u s) (wnn-const JS_ENV_EXIST) envname)
-    (comm-unpack (i) result)
+    (comm-unpack (u) result)
     result))
 
 (defun wnnrpc-make-env-sticky (env)
@@ -1156,14 +1212,14 @@
   ""
   (wnnrpc-call-with-environment env (n-dic)
     (comm-format (u u) (wnn-const JS_DIC_LIST) env-id)
-    (comm-unpack (i) n-dic)
+    (comm-unpack (u) n-dic)
     (wnnrpc-receive-dictionary-list proc n-dic)))
 
 (defun wnnrpc-get-fi-dictionary-list-with-environment (env mask)
   ""
   (wnnrpc-call-with-environment env (n-dic)
     (comm-format (u u u) (wnn-const JS_FI_DIC_LIST) env-id mask)
-    (comm-unpack (i) n-dic)
+    (comm-unpack (u) n-dic)
     (wnnrpc-receive-dictionary-list proc n-dic)))
 
 (defun wnnrpc-receive-dictionary-list (proc n-dic)
@@ -1171,7 +1227,7 @@
 	rev comment dicname freqname dic-passwd freq-passwd
 	type gosuu dic-local-flag freq-local-flag retval)
     (while (> n-dic 0)
-      (comm-unpack (i i i i i i i i S s s s s i i i i)
+      (comm-unpack (u u u u u u u u S s s s s u u u u)
 		   entry dic freq dic-mode freq-mode enable-flag nice
 		   rev comment dicname freqname dic-passwd freq-passwd
 		   type gosuu dic-local-flag freq-local-flag)
@@ -1193,7 +1249,7 @@
     (comm-format (u u i) (wnn-const JS_HINSI_DICTS) env-id -1)
     (wnnrpc-get-result
       (while (> result 0)
-	(comm-unpack (i) dic)
+	(comm-unpack (u) dic)
 	(setq dic-list (nconc dic-list (list dic))
 	      result (1- result)))
       dic-list)))
@@ -1222,7 +1278,7 @@
 				     p10 p11 p12 p13 p14 p15)
     (comm-format (u u) (wnn-const JS_PARAM_GET) env-id)
     (wnnrpc-get-result
-      (comm-unpack (i i  i i i i i  i i i i i  i i i i i)
+      (comm-unpack (u u  u u u u u  u u u u u  u u u u u)
 		   n nsho p1 p2 p3 p4 p5 p6 p7 p8 p9
 		   p10 p11 p12 p13 p14 p15)
       (vector n nsho p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15))))
@@ -1239,11 +1295,26 @@
       (vector p1 p2 p3 p4 p5 p6 p7 p8 p9
 	      p10 p11 p12 p13 p14 p15 p16 p17 p18))))
 
+(defun wnn7rpc-get-conversion-env-param (env)
+  ""
+  (wnnrpc-call-with-environment env (p1 p2 p3 p4 p5 p6 p7 p8 p9
+                                    p10 p11 p12 p13 p14 p15 p16 p17 p18
+                                    p19 p20 p21 p22 p23 p24)
+    (comm-format (u u) (wnn-const JS_GET_HENKAN_ENV) env-id)
+    (wnnrpc-get-result
+      (comm-unpack (i i i i i i i i i i i i i i i i i i i i i i i i)
+                   p1 p2 p3 p4 p5 p6 p7 p8 p9
+                   p10 p11 p12 p13 p14 p15 p16
+                   p17 p18 p19 p20 p21 p22 p23 p24)
+      (vector p1 p2 p3 p4 p5 p6 p7 p8 p9
+              p10 p11 p12 p13 p14 p15 p16 p17 p18
+              p19 p20 p21 p22 p23 p24))))
+
 (defun wnnrpc-file-loaded (proc path)
   ""
   (comm-call-with-proc proc (result)
     (comm-format (u s) (wnn-const JS_FILE_LOADED) path)
-    (comm-unpack (i) result)
+    (comm-unpack (u) result)
     result))
 
 (defun wnnrpc-write-file (env fid filename)
@@ -1261,9 +1332,9 @@
   (let ((i 0)
 	flist
 	nfiles fid local ref-count type name)
-    (comm-unpack (i) nfiles)
+    (comm-unpack (u) nfiles)
     (while (> nfiles 0)
-      (comm-unpack (i i i i s) fid local ref-count type name)
+      (comm-unpack (u u u u s) fid local ref-count type name)
       (setq flist (nconc flist (list (vector fid local ref-count type name)))
 	    nfiles (1- nfiles)))
     flist))
@@ -1284,7 +1355,7 @@
   "3: dictionary, 4: hindo file, 5: fuzokugo-file"
   (wnnrpc-call-with-environment env (result)
     (comm-format (u u s) (wnn-const JS_FILE_STAT) env-id path)
-    (comm-unpack (i) result)
+    (comm-unpack (u) result)
     result))
 
 (defun wnnrpc-get-file-info (env fid)
@@ -1292,7 +1363,7 @@
   (wnnrpc-call-with-environment env (name local ref-count type)
     (comm-format (u u u) (wnn-const JS_FILE_INFO) env-id fid)
     (wnnrpc-get-result
-      (comm-unpack (s i i i) name local ref-count type)
+      (comm-unpack (s u u u) name local ref-count type)
       (vector name local ref-count type))))
 
 (defmacro wnnrpc-receive-vector (n)
@@ -1300,7 +1371,7 @@
 	 (i 0)
 	 j)
      (while (< i ,n)
-       (comm-unpack (i) j)
+       (comm-unpack (u) j)
        (aset v i j)
        (setq i (1+ i)))
      v))
@@ -1311,7 +1382,7 @@
     (comm-format (u) (wnn-const JS_WHO))
     (wnnrpc-get-result
       (while (> result 0)
-	(comm-unpack (i s s) socket username hostname)
+	(comm-unpack (u s s) socket username hostname)
 	(setq who (nconc who
 			 (list (vector socket username hostname
 				       (wnnrpc-receive-vector
@@ -1324,7 +1395,7 @@
     (comm-format (u) (wnn-const JS_ENV_LIST))
     (wnnrpc-get-result
       (while (> result 0)
-	(comm-unpack (i s i i i) id name count fuzokugo dic-max)
+	(comm-unpack (u s u u u) id name count fuzokugo dic-max)
 	(setq envs (nconc envs
 			  (list (vector id name count fuzokugo dic-max
 					(wnnrpc-receive-vector
@@ -1338,7 +1409,7 @@
   ""
   (comm-call-with-proc proc (result)
     (comm-format (u) (wnn-const JS_KILL))
-    (comm-unpack (i) result)
+    (comm-unpack (u) result)
     result))
 
 (defun wnnrpc-delete-dictionary (env dic)
@@ -1357,7 +1428,7 @@
   ""
   (wnnrpc-call-with-proc proc (n-dic)
     (comm-format (u) (wnn-const JS_DIC_LIST_ALL))
-    (comm-unpack (i) n-dic)
+    (comm-unpack (u) n-dic)
     (wnnrpc-receive-dictionary-list proc n-dic)))
 
 (defun wnnrpc-delete-word (env dic entry)
@@ -1369,15 +1440,15 @@
 (defun wnnrpc-receive-word (proc yomi)
   (let (dic serial hinshi hindo right-now internal-hindo internal-right-now
 	kanji comment l l1)
-    (comm-unpack (i) dic)
+    (comm-unpack (u) dic)
     (while (>= dic 0)
-      (comm-unpack (i i i i i i) serial hinshi hindo right-now
+      (comm-unpack (u u u u u u) serial hinshi hindo right-now
 		   internal-hindo internal-right-now)
       (setq l (cons (vector dic serial hinshi hindo right-now
 			    internal-hindo internal-right-now
 			    yomi nil nil)
 		    l))
-      (comm-unpack (i) dic))
+      (comm-unpack (u) dic))
     (setq l (nreverse l)
 	  l1 l)
     (while l1
@@ -1492,7 +1563,7 @@
 		    (wnn-const WNN_FILE_STRING)))
 	(progn
 	  (goto-char (1+ (wnn-const WNN_FILE_STRING_LEN)))
-	  (comm-unpack (i v v v)
+	  (comm-unpack (u v v v)
 		       type
 		       uniq1 (wnn-const WNN_UNIQ_LEN)
 		       uniq2 (wnn-const WNN_UNIQ_LEN)
@@ -1573,7 +1644,7 @@
 	    (comm-format (u u v) (wnn-const JS_FILE_SEND)
 			 env-id
 			 (nth 1 header) (wnn-const WNN_UNIQ_LEN))
-	    (comm-unpack (i) file-id)
+	    (comm-unpack (u) file-id)
 	    (if (>= file-id 0)
 		(progn
 		  (wnnrpc-get-result)	; ignore result code
@@ -1612,7 +1683,7 @@
       (comm-call-with-proc proc (result)
 	(comm-format (u v) (wnn-const JS_FILE_LOADED_LOCAL)
 		     (nth 1 header) (wnn-const WNN_UNIQ_LEN))
-	(comm-unpack (i) result)
+	(comm-unpack (u) result)
 	result))))
 
 (defun wnnrpc-file-receive (env fid local-filename)
@@ -1663,7 +1734,7 @@
 	    (comm-format (u u v) (wnn-const JS_FILE_SEND)
 			 env-id
 			 (nth 1 header) (wnn-const WNN_UNIQ_LEN))
-	    (comm-unpack (i) file-id)
+	    (comm-unpack (u) file-id)
 	    (if (>= file-id 0)
 		(wnnrpc-get-result
 		  (wnnenv-set-client-file env filename)
@@ -1708,7 +1779,7 @@
 	       (eq type (wnn-const CWNN_REV_DICT))
 	       (eq type (wnn-const BWNN_REV_DICT))
 	       (eq type (wnn-const WNN_UD_DICT))
-	       (and (wnnenv-is-wnn6 env)
+	       (and (or (wnnenv-is-wnn6 env) (wnnenv-is-wnn7 env) (wnnenv-is-wnn8 env))
 		    (eq type (wnn-const WNN_FI_USER_DICT))))
 	   (wnnrpc-create-and-move-to-client env nil dicname type
 					     comment passwd hpasswd))
@@ -1768,4 +1839,175 @@
 	  (backward-char))
       (buffer-substring 1 (point))))))
 
-;;; egg/wnnrpc.el ends here
+;;; egg/wnnrpc.el ends here.
+
+;;;
+;;; Wnn7 new function:
+;;;   Input Prediction
+;;;
+;;;
+(defun wnn7rpc-yosoku-init (env)
+  "Initialize input prediction function"
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u) (wnn-const JS_YOSOKU_INIT) env-id)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-free (env)
+  "Free input prediction function area from server."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u) (wnn-const JS_YOSOKU_FREE) env-id)
+    (wnnrpc-get-result)))
+(defun wnn7rpc-yosoku-yosoku (env moji)
+  "Execute input prediction."
+  (wnnrpc-call-with-environment env (candnum len kouho kouho-list)
+    (comm-format (u u E) (wnn-const JS_YOSOKU_YOSOKU) env-id moji)
+    (wnnrpc-get-result
+      (comm-unpack (u) candnum)
+      (while (> candnum 0)
+       (comm-unpack (u s) len kouho)
+       (setq kouho (decode-coding-string kouho 'euc-jp))
+       (setq kouho-list (nconc kouho-list (list kouho))
+             candnum (1- candnum)))
+      kouho-list)))
+
+(defun wnn7rpc-yosoku-toroku (env bun-suu yosoku-bunsetsu)
+  "Register the input prediction candidate."
+  (wnnrpc-call-with-environment env ()
+    (progn
+      (comm-format (u u u) (wnn-const JS_YOSOKU_TOROKU) env-id bun-suu)
+      (while yosoku-bunsetsu
+       (comm-format (E u E u u) 
+                    (aref (car yosoku-bunsetsu) 0)
+                    (aref (car yosoku-bunsetsu) 1)
+                    (aref (car yosoku-bunsetsu) 2)
+                    (aref (car yosoku-bunsetsu) 3)
+                    (aref (car yosoku-bunsetsu) 4))
+       (setq yosoku-bunsetsu (cdr yosoku-bunsetsu))))
+    (wnnrpc-get-result)))
+                               
+(defun wnn7rpc-yosoku-selected-cand (env selectpos)
+  "Select the input prediction candidate."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u u) (wnn-const JS_YOSOKU_SELECTED_CAND) 
+                env-id selectpos)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-delete-cand (env selectpos)
+  "Delete the input prediction candidate."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u u) (wnn-const JS_YOSOKU_DELETE_CAND) 
+                env-id selectpos)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-cancel-latest-toroku (env)
+  "Cancel the latest registered word."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u) (wnn-const JS_YOSOKU_CANCEL_LATEST_TOROKU) env-id)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-reset-pre-yosoku (env)
+  "Clear the connection information for the latest registered word."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u) (wnn-const JS_YOSOKU_RESET_PRE_YOSOKU) env-id)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-ikkatsu-toroku (env torokustr)
+  "Register the input prediction candidate with phrase analysis."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u S) (wnn-const JS_YOSOKU_IKKATSU_TOROKU) 
+                env-id torokustr)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-save-datalist (env)
+  "Save the input prediction data in data file."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u) (wnn-const JS_YOSOKU_SAVE_DATALIST) env-id)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-init-time-keydata (env)
+  "Initialize input efficiency data about inputed key."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u) (wnn-const JS_YOSOKU_INIT_TIME_KEYDATA) env-id)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-init-inputinfo (env)
+  "Initialize input efficiency data about input time."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u) (wnn-const JS_YOSOKU_INIT_INPUTINFO) env-id)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-set-user-inputinfo (env allkey userkey yosokuselect)
+  "Set user input information to the input efficiency data."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u u u) (wnn-const JS_YOSOKU_SET_USER_INPUTINFO) 
+                env-id allkey 
+                (if yosokuselect
+                    (logior userkey ?\x8000)
+                  userkey))
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-set-timeinfo (env yosokuselect throughyosoku inputtime
+                                      keylen)
+  "Set input-time information to the input efficiency data."
+  (wnnrpc-call-with-environment env ()
+    (comm-format (u u u u u u) (wnn-const JS_YOSOKU_SET_TIMEINFO) 
+                env-id yosokuselect throughyosoku inputtime keylen)
+    (wnnrpc-get-result)))
+
+(defun wnn7rpc-yosoku-status (env)
+  "Get input efficiency information."
+  (wnnrpc-call-with-environment env (totalrod totalallkey totaluserkey 
+                                    totalrot totalalltime totalusertime 
+                                    stmday sthour stmin ltmday lthour ltmin
+                                    totalroykinput totalallykkey nowrod 
+                                    nowallkey nowuserkey nowrot nowalltime 
+                                    nowusertime timeperonekey)
+    (comm-format (u u) (wnn-const JS_YOSOKU_STATUS) env-id)
+    (comm-unpack (u) totalrod)
+    (if (< totalrod 0)
+       totalrod
+      (comm-unpack (u u u u u u u u u u u u u u u u u u u u)
+                  totalallkey totaluserkey 
+                  totalrot totalalltime totalusertime
+                  stmday sthour stmin ltmday lthour ltmin
+                  totalroykinput totalallykkey 
+                  nowrod nowallkey nowuserkey nowrot nowalltime nowusertime
+                  timeperonekey)
+      (vector totalrod totalallkey totaluserkey totalrot totalalltime 
+             totalusertime stmday sthour stmin ltmday lthour ltmin
+             totalroykinput totalallykkey nowrod nowallkey nowuserkey 
+             nowrot nowalltime nowusertime timeperonekey))))
+
+;;;
+;;; Wnn7 new function:
+;;;   association translation 
+;;;
+(defun wnn7rpc-assoc-with-data (env yomi hinsi fuzokugo v 
+                                  jilihin yomi_org jililen yomilen kanjilen
+                                  real_kanjilen)
+  "Convert YOMI string into Kanji with association."
+  (wnnrpc-call-with-environment env (kanji-length)
+       (comm-format (u u S i S i i u S i i i i) (wnn-const JS_HENKAN_ASSOC)
+                    env-id yomi hinsi fuzokugo
+                    (or v (wnn-const WNN_VECT_KANZEN))
+                    (if v (wnn-const WNN_VECT_KANZEN) (wnn-const WNN_VECT_NO))
+                    jilihin yomi_org jililen yomilen kanjilen real_kanjilen)
+       (wnnrpc-get-result
+        (comm-unpack (u) kanji-length) ; ignore kanji-length
+        (mapcar (lambda (b)
+                  (wnn7-bunsetsu-set-dai-continue b 
+                                                  (wnn7-bunsetsu-connect-next b))
+                  (list b))
+                (wnn7rpc-receive-sho-bunsetsu-list env result)))))
+
+
+(defun wnn7rpc-set-henkan-hinshi (env mode nhinshi hlist)
+  ""
+  (wnnrpc-call-with-environment env ()
+     (progn
+       (comm-format (u u i i) (wnn-const JS_SET_HENKAN_HINSI) 
+                   env-id mode nhinshi)
+       (while hlist
+        (comm-format (u) (car hlist))
+        (setq hlist (cdr hlist))))
+     (wnnrpc-get-result)))
--- egg-4.0.6+0.20041122cvs.orig/egg/wnn.el
+++ egg-4.0.6+0.20041122cvs/egg/wnn.el
@@ -384,6 +384,8 @@
 (defsubst wnnenv-set-bmodify (env v)   (aset (wnnenv-get-auto-learn env) 1 v))
 
 (defsubst wnnenv-is-wnn6 (env)         (eq (wnnenv-get-wnn-version env) 'wnn6))
+(defsubst wnnenv-is-wnn7 (env)         (eq (wnnenv-get-wnn-version env) 'wnn7))
+(defsubst wnnenv-is-wnn8 (env)         (eq (wnnenv-get-wnn-version env) 'wnn8))
 
 (defvar wnn-environments nil
   "Environment for Wnn conversion server")
@@ -947,7 +949,7 @@
     (let* ((head (car bunsetsu-list))
 	   (env (wnn-bunsetsu-get-env head)))
       (prog1
-	  (if (wnnenv-is-wnn6 env)
+	  (if (or (wnnenv-is-wnn6 env) (wnnenv-is-wnn7 env) (wnnenv-is-wnn8 env))
 	      (progn
 		(wnn-clear-now-flag bunsetsu-list)
 		(wnn-merge-fi-rel head (cdr bunsetsu-list))
@@ -1263,12 +1265,17 @@
 (defvar wnn-current-envspec-reverse nil)
 (defvar wnn-server-type nil)
 (defvar wnn-wnn6-server nil)
+(defvar wnn-wnn7-server nil)
+(defvar wnn-wnn8-server nil)
 
 (defmacro wnn-envspec-conv-param-name-list ()
   ''(last-is-first complex okuri-learn okuri
      prefix-learn prefix suffix-learn common-learn freq-func
      numeric alphabet symbol yuragi rendaku bunsetsugiri muhenkan
-     fi-relation-learn fi-freq-func))
+     fi-relation-learn fi-freq-func
+     ;; Wnn7/8 funcs bellow
+     yosoku-learn yosoku-max-disp yosoku-last-is-first
+     boin-kabusoku shiin-choka n-choka nihongo-kosei))
 
 (defmacro wnn-envspec-conv-param-length ()
   (length (wnn-envspec-conv-param-name-list)))
@@ -1369,7 +1376,7 @@
 		   `((null (or (eq ,drw nil) (eq ,drw t)
 			       (eq ,drw 0) (eq ,drw 1)
 			       ,@(if dmax
-				     `((and wnn-wnn6-server
+				     `((and (or wnn-wnn6-server wnn-wnn7-server wnn-wnn8-server)
 					    ,@(let ((x `((eq ,drw 2))))
 						(when (>= dmax 3)
 						  (nconc x `((eq ,drw 3))))
@@ -1380,7 +1387,7 @@
 		   `((null (or (eq ,frw nil) (eq ,frw t)
 			       (eq ,frw 0) (eq ,frw 1)
 			       ,@(if fmax
-				     `((and wnn-wnn6-server
+				     `((and (or wnn-wnn6-server wnn-wnn7-server wnn-wnn8-server)
 					    ,@(let ((x `((eq ,frw 2))))
 						(when (>= fmax 3)
 						  (nconc x `((eq ,frw 3))))
@@ -1402,6 +1409,22 @@
   `(or wnn-wnn6-server
        (egg-error ,(format "%s is available only on Wnn6" func))))
 
+(defmacro wnn-wnn7-env-func (func)
+  `(or wnn-wnn7-server
+       (egg-error ,(format "%s is available only on Wnn7" func))))
+
+(defmacro wnn-wnn8-env-func (func)
+  `(or wnn-wnn8-server
+       (egg-error ,(format "%s is available only on Wnn8" func))))
+
+(defmacro wnn-wnn7-and-wnn8-env-func (func)
+  `(or (or wnn-wnn7-server wnn-wnn8-server)
+       (egg-error ,(format "%s is available only on Wnn7/Wnn8" func))))
+
+(defmacro wnn-wnn678-env-func (func)
+  `(or (or wnn-wnn6-server wnn-wnn7-server wnn-wnn8-server)
+       (egg-error ,(format "%s is available only on Wnn6/Wnn7/Wnn8" func))))
+
 (defun wnn-add-dict (dict freq priority dict-rw freq-rw
 		     &optional dict-passwd freq-passwd &rest reverse)
   (wnn-add-dict-param-check wnn-add-dict
@@ -1412,7 +1435,7 @@
 			    dict-passwd freq-passwd reverse))
 
 (defun wnn-add-fisys-dict (dict freq freq-rw &optional freq-passwd)
-  (wnn-wnn6-env-func wnn-add-fisys-dict)
+  (wnn-wnn678-env-func wnn-add-fisys-dict)
   (wnn-add-dict-param-check wnn-add-fisys-dict
 			    dict freq nil nil nil freq-rw 3
 			    nil freq-passwd)
@@ -1421,7 +1444,7 @@
 
 (defun wnn-add-fiusr-dict (dict freq dict-rw freq-rw
 			   &optional dict-passwd freq-passwd)
-  (wnn-wnn6-env-func wnn-add-fiusr-dict)
+  (wnn-wnn678-env-func wnn-add-fiusr-dict)
   (wnn-add-dict-param-check wnn-add-fiusr-dict
 			    dict freq nil dict-rw 3 freq-rw 3
 			    dict-passwd freq-passwd)
@@ -1431,7 +1454,7 @@
 
 (defun wnn-add-notrans-dict (dict priority dict-rw
 			     &optional dict-passwd &rest reverse)
-  (wnn-wnn6-env-func wnn-add-notrans-dict)
+  (wnn-wnn678-env-func wnn-add-notrans-dict)
   (wnn-add-dict-param-check wnn-add-notrans-dict
 			    dict nil priority dict-rw nil nil nil
 			    dict-passwd nil reverse)
@@ -1442,7 +1465,7 @@
 
 (defun wnn-add-bmodify-dict (dict priority dict-rw
 			     &optional dict-passwd &rest reverse)
-  (wnn-wnn6-env-func wnn-add-notrans-dict)
+  (wnn-wnn678-env-func wnn-add-notrans-dict)
   (wnn-add-dict-param-check wnn-add-bmodify-dict
 			    dict nil priority dict-rw nil nil nil
 			    dict-passwd nil reverse)
@@ -1466,22 +1489,22 @@
 		     (t (wnn-arg-type-error ,func)))))
 
 (defun wnn-set-last-is-first-mode (flag)
-  (wnn-wnn6-env-func wnn-set-last-is-first-mode)
+  (wnn-wnn678-env-func wnn-set-last-is-first-mode)
   (wnn-boolean-param-check wnn-set-last-is-first-mode flag)
   (wnn-envspec-set-conv-param-last-is-first wnn-current-envspec flag))
 
 (defun wnn-set-complex-conv-mode (flag)
-  (wnn-wnn6-env-func wnn-set-complex-conv-mode)
+  (wnn-wnn678-env-func wnn-set-complex-conv-mode)
   (wnn-boolean-param-check wnn-set-complex-conv-mode flag)
   (wnn-envspec-set-conv-param-complex wnn-current-envspec flag))
 
 (defun wnn-set-okuri-learn-mode (flag)
-  (wnn-wnn6-env-func wnn-set-okuri-learn-mode)
+  (wnn-wnn678-env-func wnn-set-okuri-learn-mode)
   (wnn-boolean-param-check wnn-set-okuri-learn-mode flag)
   (wnn-envspec-set-conv-param-okuri-learn wnn-current-envspec flag))
 
 (defun wnn-set-okuri-flag (mode)
-  (wnn-wnn6-env-func wnn-set-okuri-flag)
+  (wnn-wnn678-env-func wnn-set-okuri-flag)
   (setq mode (cond ((or (eq mode -1) (eq mode 'regulation)) -1)
 		   ((or (eq mode  0) (eq mode 'no))          0)
 		   ((or (eq mode  1) (eq mode 'yes))         1)
@@ -1489,29 +1512,29 @@
   (wnn-envspec-set-conv-param-okuri wnn-current-envspec mode))
 
 (defun wnn-set-prefix-learn-mode (flag)
-  (wnn-wnn6-env-func wnn-set-prefix-learn-mode)
+  (wnn-wnn678-env-func wnn-set-prefix-learn-mode)
   (wnn-boolean-param-check wnn-set-prefix-learn-mode flag)
   (wnn-envspec-set-conv-param-prefix-learn wnn-current-envspec flag))
 
 (defun wnn-set-prefix-flag (mode)
-  (wnn-wnn6-env-func wnn-set-prefix-flag)
+  (wnn-wnn678-env-func wnn-set-prefix-flag)
   (setq mode (cond ((or (eq mode 0) (eq mode 'hiragana)) 0)
 		   ((or (eq mode 1) (eq mode 'kanji))    1)
 		   (t (wnn-arg-type-error wnn-set-prefix-flag))))
   (wnn-envspec-set-conv-param-prefix wnn-current-envspec mode))
 
 (defun wnn-set-suffix-learn-mode (flag)
-  (wnn-wnn6-env-func wnn-set-suffix-learn-mode)
+  (wnn-wnn678-env-func wnn-set-suffix-learn-mode)
   (wnn-boolean-param-check wnn-set-suffix-learn-mode flag)
   (wnn-envspec-set-conv-param-suffix-learn wnn-current-envspec flag))
 
 (defun wnn-set-common-learn-mode (flag)
-  (wnn-wnn6-env-func wnn-set-common-learn-mode)
+  (wnn-wnn678-env-func wnn-set-common-learn-mode)
   (wnn-boolean-param-check wnn-set-common-learn-mode flag)
   (wnn-envspec-set-conv-param-common-learn wnn-current-envspec flag))
 
 (defun wnn-set-freq-func-mode (mode)
-  (wnn-wnn6-env-func wnn-set-freq-func-mode)
+  (wnn-wnn678-env-func wnn-set-freq-func-mode)
   (setq mode (cond ((or (eq mode 0) (eq mode 'not))    0)
 		   ((or (eq mode 1) (eq mode 'always)) 1)
 		   ((or (eq mode 2) (eq mode 'high))   2)
@@ -1521,7 +1544,7 @@
   (wnn-envspec-set-conv-param-freq-func wnn-current-envspec mode))
 
 (defun wnn-set-numeric-mode (mode)
-  (wnn-wnn6-env-func wnn-set-numeric-mode)
+  (wnn-wnn678-env-func wnn-set-numeric-mode)
   (setq mode (cond ((or (eq mode  -2) (eq mode 'han))       -2)
 		   ((or (eq mode -12) (eq mode 'zen))      -12)
 		   ((or (eq mode -13) (eq mode 'kan))      -13)
@@ -1533,14 +1556,14 @@
   (wnn-envspec-set-conv-param-numeric wnn-current-envspec mode))
 
 (defun wnn-set-alphabet-mode (mode)
-  (wnn-wnn6-env-func wnn-set-alphabet-mode)
+  (wnn-wnn678-env-func wnn-set-alphabet-mode)
   (setq mode (cond ((or (eq mode  -4) (eq mode 'han))  -4)
 		   ((or (eq mode -30) (eq mode 'zen)) -30)
 		   (t (wnn-arg-type-error wnn-set-alphabet-mode))))
   (wnn-envspec-set-conv-param-alphabet wnn-current-envspec mode))
 
 (defun wnn-set-symbol-mode (mode)
-  (wnn-wnn6-env-func wnn-set-symbol-mode)
+  (wnn-wnn678-env-func wnn-set-symbol-mode)
   (setq mode (cond ((or (eq mode  -5) (eq mode 'han))  -5)
 		   ((or (eq mode -40) (eq mode 'jis)) -40)
 		   ((or (eq mode -41) (eq mode 'asc)) -41)
@@ -1548,21 +1571,59 @@
   (wnn-envspec-set-conv-param-symbol wnn-current-envspec mode))
 
 (defun wnn-set-yuragi-mode (flag)
-  (wnn-wnn6-env-func wnn-set-yuragi-mode)
+  (wnn-wnn678-env-func wnn-set-yuragi-mode)
   (wnn-boolean-param-check wnn-set-yuragi-mode flag)
   (wnn-envspec-set-conv-param-yuragi wnn-current-envspec flag))
 
 (defun wnn-set-rendaku-mode (flag)
-  (wnn-wnn6-env-func wnn-set-rendaku-mode)
+  (wnn-wnn678-env-func wnn-set-rendaku-mode)
   (wnn-boolean-param-check wnn-set-rendaku-mode flag)
   (wnn-envspec-set-conv-param-rendaku wnn-current-envspec flag))
+
+;; added for Wnn7
+(defun wnn-set-yosoku-learn-mode (flag)
+  (wnn-wnn7-and-wnn8-env-func wnn-set-yosoku-learn-mode)
+  (wnn-boolean-param-check wnn-set-yosoku-learn-mode flag)
+  (wnn-envspec-set-conv-param-yosoku-learn wnn-current-envspec flag))
+
+(defun wnn-set-yosoku-max-disp (mode)
+  (wnn-wnn7-and-wnn8-env-func wnn-set-yosoku-max-disp)
+  (setq mode (cond ((and (<= mode 10) (>= mode 1) mode))
+		   (t (wnn-arg-type-error wnn-set-yosoku-max-disp))))
+  (wnn-envspec-set-conv-param-yosoku-max-disp wnn-current-envspec mode))
+
+(defun wnn-set-yosoku-last-is-first-mode (flag)
+  (wnn-wnn7-and-wnn8-env-func wnn-set-yosoku-last-is-first-mode)
+  (wnn-boolean-param-check wnn-set-yosoku-last-is-first-mode flag)
+  (wnn-envspec-set-conv-param-yosoku-last-is-first wnn-current-envspec flag))
+
+(defun wnn-set-boin-kabusoku-mode (flag)
+  (wnn-wnn7-and-wnn8-env-func wnn-set-boin-kabusoku-mode)
+  (wnn-boolean-param-check wnn-set-boin-kabusoku-mode flag)
+  (wnn-envspec-set-conv-param-boin-kabusoku wnn-current-envspec flag))
+
+(defun wnn-set-shiin-choka-mode (flag)
+  (wnn-wnn7-and-wnn8-env-func wnn-set-shiin-choka-mode)
+  (wnn-boolean-param-check wnn-set-shiin-choka-mode flag)
+  (wnn-envspec-set-conv-param-shiin-choka wnn-current-envspec flag))
+
+(defun wnn-set-n-choka-mode (flag)
+  (wnn-wnn7-and-wnn8-env-func wnn-set-n-choka-mode)
+  (wnn-boolean-param-check wnn-set-n-choka-mode flag)
+  (wnn-envspec-set-conv-param-n-choka wnn-current-envspec flag))
+
+(defun wnn-set-nihongo-kosei-mode (flag)
+  (wnn-wnn7-and-wnn8-env-func wnn-set-nihongo-kosei-mode)
+  (wnn-boolean-param-check wnn-set-nihongo-kosei-mode flag)
+  (wnn-envspec-set-conv-param-nihongo-kosei wnn-current-envspec flag))
+
 
 (defun wnn-renbunsetsu-conversion (env yomi hinshi fuzokugo v context)
   (let ((result
 	 (cond
 	  ((wnnenv-get-tankan env)
 	   (wnnrpc-tanbunsetsu-conversion env yomi hinshi fuzokugo v))
-	  ((wnnenv-is-wnn6 env)
+	  ((or (wnnenv-is-wnn6 env) (wnnenv-is-wnn7 env) (wnnenv-is-wnn8 env))
 	   (wnnrpc-fi-renbunsetsu-conversion env yomi hinshi fuzokugo v
 					     context))
 	  (t
@@ -1838,6 +1899,8 @@
 						 (eq wnn-server-type 'tserver))
 					     "PZ"))))
 	(fset 'is-wnn6-server (lambda () wnn-wnn6-server))
+	(fset 'is-wnn7-server (lambda () wnn-wnn7-server))
+	(fset 'is-wnn8-server (lambda () wnn-wnn8-server))
 	(fset 'set-wnn-fuzokugo 'wnn-set-fuzokugo)
 	(fset 'add-wnn-dict 'wnn-add-dict)
 	(fset 'set-wnn-param 'wnn-set-param)
@@ -1875,6 +1938,8 @@
 		    wnn-envspec-list nil)
 	      (condition-case err
 		  (let ((wnn-server-type server-type)
+			(wnn-wnn8-server (eq version 'wnn8))
+			(wnn-wnn7-server (eq version 'wnn7))
 			(wnn-wnn6-server (eq version 'wnn6)))
 		    (if wnn-use-v3-eggrc
 			(wnn-v3-eggrc-defines))
@@ -1946,8 +2011,10 @@
 	      (setq cvmask (wnn-envspec-conv-vmask spec)
 		    param (wnn-envspec-conv-param spec))
 	      (if (/= cvmask 0)
-		  (wnnrpc-set-conversion-env-param env cvmask param))))
-	   ((eq version 'wnn6)
+		  (if (or (wnnenv-is-wnn7 env) (wnnenv-is-wnn8 env))
+		      (wnn7rpc-set-conversion-env-param env cvmask param)
+		    (wnnrpc-set-conversion-env-param env cvmask param)))))
+	   ((or (eq version 'wnn6) (eq version 'wnn7) (eq version 'wnn8))
 	    (wnnenv-set-bmodify env (wnn-get-autolearning-dic-mode
 				     env (WNN-const BMODIFY_LEARN)))
 	    (wnnenv-set-notrans env (wnn-get-autolearning-dic-mode
@@ -1955,7 +2022,7 @@
 	  (cond
 	   ((eq (wnnenv-get-server-type env) 'jserver)
 	    (wnn-set-hinshi env 'noun "名詞")
-	    (when (wnnenv-is-wnn6 env)
+	    (when (or (wnnenv-is-wnn6 env) (wnnenv-is-wnn7 env) (wnnenv-is-wnn8 env))
 	      (wnn-set-hinshi env 'settou "接頭語(お)")
 	      (wnn-set-hinshi env 'rendaku "連濁")))
 	   ((eq (wnnenv-get-server-type env) 'cserver)
@@ -2008,7 +2075,7 @@
       (WNN-const DIC_RDONLY))))
 
 (defun wnn-get-dictionary-list-with-environment (env)
-  (if (wnnenv-is-wnn6 env)
+  (if (or (wnnenv-is-wnn6 env) (wnnenv-is-wnn7 env) (wnnenv-is-wnn8 env))
       (wnnrpc-get-fi-dictionary-list-with-environment env
 						      (WNN-const DIC_NO_TEMPS))
     (wnnrpc-get-dictionary-list-with-environment env)))
--- egg-4.0.6+0.20041122cvs.orig/egg-com.el
+++ egg-4.0.6+0.20041122cvs/egg-com.el
@@ -757,7 +757,7 @@
 (defmacro comm-accept-process-output ()
   `(let ((p (point)))
      (if (null (accept-process-output proc comm-accept-timeout))
-	 (egg-error "backend timeout"))
+	 (egg-error "backend timeout (comm-accept-process-output)"))
      (goto-char p)))
 
 (defmacro comm-require-process-output (n)
@@ -769,7 +769,7 @@
 	(r (+ (point) n)))
     (while (< (point-max) r)
       (if (null (accept-process-output proc comm-accept-timeout))
-	  (egg-error "backend timeout"))
+	  (egg-error "backend timeout (comm-wait-for-space)"))
       (goto-char p))))
 
 (defmacro comm-following+forward-char ()
@@ -893,7 +893,7 @@
   `(let* ((proc ,proc)
 	  (buffer (process-buffer proc))
 	  ,@vlist)
-     (if (and (eq (process-status proc) 'open)
+     (if (and (memq (process-status proc) '(open run))
 	      (buffer-live-p buffer))
 	 (save-excursion
 	   (set-buffer buffer)
--- egg-4.0.6+0.20041122cvs.orig/egg.el
+++ egg-4.0.6+0.20041122cvs/egg.el
@@ -30,7 +30,7 @@
 
 ;;; Code:
 
-(defconst egg-version "4.0.6"
+(defconst egg-version "4.0.6+20020909cvs"
   "Version number for this version of Tamago.")
 
 (eval-when-compile
--- egg-4.0.6+0.20041122cvs.orig/eggrc
+++ egg-4.0.6+0.20041122cvs/eggrc
@@ -77,7 +77,7 @@
   (wnn-add-dict "iwanami/tankan2.dic"  nil             1 nil nil)
   (wnn-add-dict "iwanami/tel.dic"      nil             1 nil nil)
   (wnn-add-dict "iwanami/zip.dic"      nil             1 nil nil)
-  (wnn-add-dict '("ud")                nil            15 t   t)
+  (wnn-add-dict '("ud")                nil             15 t   t)
 ;  (wnn-add-dict "wnncons/tankan2.dic"  nil            1 nil nil)
 ;  (wnn-add-dict "wnncons/tankan3.dic"  nil            1 nil nil)
   (wnn-set-param  5 10 2 45 0  80 5 1 20  0 400 -100 400   80 200 2 200)
@@ -113,30 +113,31 @@
   (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 "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")                   ""                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-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-add-dict "option/computer.dic"     '("computer.h")   1 nil t)
 
   (wnn-set-param  5 10 2 45 0  80 5 1 20  0 400 -100 400   80 200 2 200)
 
@@ -156,14 +157,14 @@
 
   (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-yosoku-learn-mode t)
+  (wnn-set-yosoku-max-disp 10)
+  (wnn-set-yosoku-last-is-first-mode t)
+
+  (wnn-set-boin-kabusoku-mode t)
+  (wnn-set-shiin-choka-mode t)
+  (wnn-set-n-choka-mode t)
+  (wnn-set-nihongo-kosei-mode t)
 
   ;; (wnn-set-numeric-mode -12)
   ;; (wnn-set-alphabet-mode -30)
@@ -171,36 +172,150 @@
 
   (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/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/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/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 "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 "option/computerR.dic"         nil 1 nil nil)
 
-  (wnn-add-dict '("ud") nil 15 t t)
+  (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 wnn8-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/kihon3_4.dic"       '("kihon3_4.h")       6 nil t)
+  (wnn-add-dict "system/symbol.dic"         '("symbol.h")         1 nil t)
+  (wnn-add-dict "system/symbol3_4.dic"      '("symbol3_4.h")      1 nil t)
+  (wnn-add-dict "system/symbol_noat.dic"    '("symbol_noat.h")    1 nil t)
+  (wnn-add-dict "system/symbol3_4_noat.dic" '("symbol3_4_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/tankan3_4.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")                      ""                    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-add-dict "option/computer.dic"     '("computer.h")   1 nil t)
+  (wnn-add-dict "option/business.dic"     '("business.h")   1 nil t)
+  (wnn-add-dict "option/food.dic"         '("food.h")       1 nil t)
+  (wnn-add-dict "option/hobby.dic"        '("hobby.h")      1 nil t)
+  (wnn-add-dict "option/mailextend.dic"   '("mailextend.h") 1 nil t)
+  (wnn-add-dict "option/person.dic"       '("person.h")     1 nil t)
+  (wnn-add-dict "option/sports.dic"       '("sports.h")     1 nil t)
+  (wnn-add-dict "option/spot.dic"         '("spot.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-mode t)
+  (wnn-set-yosoku-max-disp 10)
+  (wnn-set-yosoku-last-is-first-mode t)
+
+  (wnn-set-boin-kabusoku-mode t)
+  (wnn-set-shiin-choka-mode t)
+  (wnn-set-n-choka-mode t)
+  (wnn-set-nihongo-kosei-mode 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/kihon3_4R.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 "system/tankan3_4R.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 "option/computerR.dic"         nil 1 nil nil)
+  ;;(wnn-add-dict "option/businessR.dic"         nil 1 nil nil)
+  ;;(wnn-add-dict "option/foodR.dic"             nil 1 nil nil)
+  ;;(wnn-add-dict "option/hobbyR.dic"            nil 1 nil nil)
+  ;;(wnn-add-dict "option/mailextendR.dic"       nil 1 nil nil)
+  ;;(wnn-add-dict "option/personR.dic"           nil 1 nil nil)
+  ;;(wnn-add-dict "option/sportsR.dic"           nil 1 nil nil)
+  ;;(wnn-add-dict "option/spotR.dic"             nil 1 nil nil)
+
+  (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))
 
 (cond
  ((eq egg-backend-type 'wnn)
   (cond
    ((eq wnn-server-type 'jserver)
-    (if wnn-wnn6-server
-	(wnn6-jserver-setup)
-      (wnn4-jserver-setup)))
+    (if wnn-wnn8-server
+	(wnn8-jserver-setup)
+      (if wnn-wnn7-server
+	  (wnn7-jserver-setup)
+	(if wnn-wnn6-server
+	    (wnn6-jserver-setup)
+	  (wnn4-jserver-setup)))))
 
    ((eq wnn-server-type 'cserver)
     (if wnn-use-bixing
--- egg-4.0.6+0.20041122cvs.orig/its.el
+++ egg-4.0.6+0.20041122cvs/its.el
@@ -1561,25 +1561,23 @@
 ;; which isn't terminated with a newline or the command `previous-line'
 ;; is used in the first line of a buffer.
 (defun its-next-line (&optional arg)
-  "Go to the end of the line if the line isn't terminated with a newline,
-otherwise run `next-line' as usual."
+  "Go to the end of the line if the line isn't terminated with a newline, otherwise run `next-line' as usual."
   (interactive "p")
   (if (= (line-end-position) (point-max))
       (end-of-line)
     (next-line arg)))
 
 (defun its-previous-line (&optional arg)
-  "Go to the beginning of the line if it is called in the first line of a
-buffer, otherwise run `previous-line' as usual."
+  "Go to the beginning of the line if it is called in the first line of a buffer, otherwise run `previous-line' as usual."
   (interactive "p")
   (if (= (line-beginning-position) (point-min))
       (beginning-of-line)
     (previous-line arg)))
 
 (substitute-key-definition 'next-line 'its-next-line
-			   its-mode-map global-map)
+                          its-mode-map global-map)
 (substitute-key-definition 'previous-line 'its-previous-line
-			   its-mode-map global-map)
+                          its-mode-map global-map)
 
 (provide 'its)
 
--- egg-4.0.6+0.20041122cvs.orig/helper/egg-helper.c
+++ egg-4.0.6+0.20041122cvs/helper/egg-helper.c
@@ -0,0 +1,118 @@
+/*
+ * egg unix domain socket connetion helper.
+ * This program is based on icanna.c (yc-el's canna unix domain socket helper)
+ *
+ * Copyright (c) 2005 ISHIKAWA Mutsumi
+ *
+*/
+
+/* icanna.c
+ * VERSION: 0.9.0
+ * AUTHER: knak@ceres.dti.ne.jp
+ * DATE: 2003.9.29
+ * LICENCE: GPL
+ */
+
+/*
+ * communicate unix domain IM server
+ * stdin -> IM server -> stdout
+ */
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#define BFSZ (4096)  /* buffer size */
+
+#define SUNMAX 108   /* sockaddr_un.sun_path length = 108 */
+
+/*
+ * connect unix domain IM server
+ */
+int connect_server(const char *sock_path)
+{
+	int sockfd;
+	struct sockaddr_un sun;
+	
+	/* create unix domain socket */
+	if ((sockfd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
+		perror("unable open socket");
+		exit(1);
+	}
+
+	/* connect IM server */
+	sun.sun_family = AF_UNIX;
+	strncpy(sun.sun_path, sock_path, SUNMAX - 1);
+	if (connect(sockfd, (struct sockaddr*)&sun, SUN_LEN(&sun)) < 0) {
+		perror("unable connect");
+		exit(1);
+	}
+	return sockfd;
+}
+
+/*
+ * data transport
+ * stdin -> IM server
+ * IMserver -> stdout
+ */
+int transport(int in, int out)
+{
+	char* buf = NULL; /* data buffer */
+	int len = BFSZ;	  /* data length */
+	int count = -1;	  /* read count */
+	
+	/* read input */
+	while (len == BFSZ) {
+		count++;
+		/* allocate data buffer */
+		if ((buf = (char*)realloc(buf, (count + 1) * BFSZ)) == NULL) {
+			perror("realloc");
+			exit(1);
+		}
+		/* read input to data buffer */
+		if ((len = read(in, buf + count * BFSZ, BFSZ)) < 0) {
+			perror("read");
+			exit(1);
+		}
+	}
+	len += count * BFSZ;
+	/* write output */
+	if (len > 0 && write(out, buf, len) < 0) {
+		perror("write");
+		exit(1);
+	}
+	/* destroy data buffer */
+	free(buf);
+	return len;
+}
+
+/*
+ * communicate unix domain IM server
+ */
+int main(int argc, char *argv[])
+{
+	int server;
+	struct stat stat_buf;
+	
+	if ( argc < 2 ) {
+		fprintf(stderr, "usage: egg-helper socket_path\n");
+		exit(1);
+	}
+
+	/* connect IM server via unix domain socket */
+	server = connect_server(argv[1]);
+	
+	/* transport request & response, until stdin or IM server is eof */
+	while (1)
+		/* transport request from stdin to IM server,
+		 * transport response from IM server to stdout */
+		if (transport(0, server) == 0 || transport(server, 1) == 0)
+			/* when stdin or IM server is eof, break loop */
+			break;
+	close(server); /* close IM server via unix domain socket */
+	exit(0);
+}
--- egg-4.0.6+0.20041122cvs.orig/debian/changelog
+++ egg-4.0.6+0.20041122cvs/debian/changelog
@@ -0,0 +1,285 @@
+egg (4.0.6+0.20041122cvs-9) unstable; urgency=low
+
+  * add emacs-snapshot support
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Sun,  7 Aug 2005 01:33:26 +0900
+
+egg (4.0.6+0.20041122cvs-8) unstable; urgency=low
+
+  * add missing dependency
+    Pre-Depends: make
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Fri, 29 Apr 2005 14:03:43 +0900
+
+egg (4.0.6+0.20041122cvs-7) unstable; urgency=low
+
+  * update README.Debian
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Tue, 29 Mar 2005 18:27:00 +0900
+
+egg (4.0.6+0.20041122cvs-6) unstable; urgency=low
+
+  * description typo fix, thanks Tagoh...
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Wed, 23 Mar 2005 22:26:53 +0900
+
+egg (4.0.6+0.20041122cvs-5) unstable; urgency=low
+
+  * eggrc typo fix
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Mon, 28 Feb 2005 09:04:38 +0900
+
+egg (4.0.6+0.20041122cvs-4) unstable; urgency=low
+
+  * add egg-helper to connect IM server via UNIX domain socket
+  * Architecture: all -> any (because egg-helper is architecture depend binary)
+  * canna backend change to use egg-helper instead of icanna (of yc-el)
+  * drop Suggests: yc-el
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Thu, 24 Feb 2005 03:11:27 +0900
+
+egg (4.0.6+0.20041122cvs-3) unstable; urgency=low
+
+  * fix canna inet connection error on Emacs 21.3,
+    thanks Hajimu UMEMOTO :-)
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Thu, 24 Feb 2005 00:19:06 +0900
+
+egg (4.0.6+0.20041122cvs-2) unstable; urgency=low
+
+  * fix eggrc wnn7 entry
+  * fix Wnn server connect error from client running on 64bit environment
+    to server running on 32bit environment.
+  * add Wnn8 support
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Wed, 23 Feb 2005 01:58:15 +0900
+
+egg (4.0.6+0.20041122cvs-1) unstable; urgency=low
+
+  * import changeset from unofficial tar archive([tamago:00643])
+    - Add kana input support
+    - Makefile.in cleanup
+  * canna backend UNIX domain socket support
+    (written by Tagoh, Ukai and me)
+  * cleanup orig.tar.gz
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Thu, 10 Feb 2005 20:07:23 +0900
+
+egg (4.0.6+0.20020909cvs-6) unstable; urgency=low
+
+  * change dependency from `Depends: emacs21' to `Depends: emacs21-nox |
+    emacs21' to solve tasksel Japanese problem (requested from Kenshi Muto)
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Mon,  2 Aug 2004 15:01:12 +0900
+
+egg (4.0.6+0.20020909cvs-5) unstable; urgency=low
+
+  * anthy support fix ([tamago:00639])
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Sun, 18 Jul 2004 02:46:21 +0900
+
+egg (4.0.6+0.20020909cvs-4) unstable; urgency=low
+
+  * remove Depends: emacs20 (emacs20 was removed from Debian tree)
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Fri, 20 Feb 2004 00:11:29 +0900
+
+egg (4.0.6+0.20020909cvs-3) unstable; urgency=low
+
+  * remove Depends: emacs20-dl (emacs20-dl was removed from Debian tree)
+    closes: #190828
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Sat, 26 Apr 2003 19:25:11 +0900
+
+egg (4.0.6+0.20020909cvs-2) unstable; urgency=low
+
+  * change maintainer's email address
+  * adapt policy 3.5.8.0
+  * add suggects: canna|freewnn-jserver|freewnn-cserver|freewnn-kserver|anthy
+
+ -- ISHIKAWA Mutsumi <ishikawa@debian.org>  Sun,  5 Jan 2003 14:29:37 +0900
+
+egg (4.0.6+0.20020909cvs-1) unstable; urgency=low
+
+  * update to current CVS (20020909)
+  * emacsen-install cleanup
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Sat, 14 Sep 2002 14:51:20 +0900
+
+egg (4.0.6+0.20020814cvs-1) unstable; urgency=low
+
+  * update to current CVS (20020814)
+    - add Anthy support
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Wed, 14 Aug 2002 00:44:32 +0900
+
+egg (4.0.6+0.20020802cvs-1) unstable; urgency=low
+
+  * update to current CVS (20020802)
+    - its.el (its-previous-line): point-mim -> point-min (typo)
+  
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Fri,  2 Aug 2002 12:49:43 +0900
+
+egg (4.0.6+0.20020722cvs-1) unstable; urgency=low
+
+  * update to current CVS (20020722)
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Tue, 23 Jul 2002 00:23:52 +0900
+
+egg (4.0.6+0.20020720cvs-1) unstable; urgency=low
+
+  * update to current CVS (20020720)
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Sat, 20 Jul 2002 22:06:04 +0900
+
+egg (4.0.6+0.20011201cvs-3.8) unstable; urgency=low
+
+  * add wnn-set param functions for Wnn7
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Sat,  1 Jun 2002 02:41:39 +0900
+
+egg (4.0.6+0.20011201cvs-3.7) unstable; urgency=low
+
+  * Now Wnn7 jserver will be auto detected.
+    but code is very very and very ad-hoc, (wara
+  * update README.Debian about Wnn7
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Wed, 29 May 2002 02:14:12 +0900
+
+egg (4.0.6+0.20011201cvs-3.6) unstable; urgency=low
+
+  * fix wnn7 detection code (not complete yet)
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Mon, 27 May 2002 22:12:32 +0900
+
+egg (4.0.6+0.20011201cvs-3.5) unstable; urgency=low
+
+  * replace wnn7rpc-call-with-environment -> wnnrpc-call-with-environment
+  * replace wnn7rpc-get-result -> wnnrpc-get-result
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Fri, 24 May 2002 02:15:25 +0900
+
+egg (4.0.6+0.20011201cvs-3.4) unstable; urgency=low
+
+  * import some functions and modification from wnn7egg-rpc.el
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Thu, 23 May 2002 03:54:49 +0900
+
+egg (4.0.6+0.20011201cvs-3.3) unstable; urgency=low
+
+  * wnn7 protocol command is added in wnnrpc.el
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Thu, 23 May 2002 03:21:00 +0900
+
+egg (4.0.6+0.20011201cvs-3.2) unstable; urgency=low
+
+  * more bit of wnn7 support
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Thu, 23 May 2002 03:13:02 +0900
+
+egg (4.0.6+0.20011201cvs-3.1) unstable; urgency=low
+
+  * change these functions in egg/wnn.el:
+    (defsubst wnnenv-is-wnn6 (env)         (or (eq (wnnenv-get-wnn-version env) 'wnn7)
+					   (eq (wnnenv-get-wnn-version env) 'wnn6)))
+    (defsubst wnnenv-is-wnn7 (env)         (eq (wnnenv-get-wnn-version env) 'wnn7))
+
+  * add ((eq c 'JLIB_VERSION_WNN7)  ?\x4f01) in egg/wnnrpc.el
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Thu, 23 May 2002 02:57:55 +0900
+
+egg (4.0.6+0.20011201cvs-3) unstable; urgency=low
+
+  * add computer.dic entry in eggrc and add description about this
+    in README.Debian
+  * cleanup startup elisp file
+  * change Priority: from optional to extra (adapt override file)
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Thu, 23 May 2002 02:40:28 +0900
+
+egg (4.0.6+0.20011201cvs-2) unstable; urgency=low
+
+  * add Wnn7 support (does not support full functions yet, please
+    read README.Debian)
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Thu, 23 May 2002 01:00:48 +0900
+
+egg (4.0.6+0.20011201cvs-1) unstable; urgency=low
+
+  * update to current CVS (2002/12/1)
+  * import various patches from Tamago ML
+    [tamago:00546] [tamago:00534] [tamago:00468]
+  * import wnn7egg eggrc defines based on [tamago:00504]
+  * import patch from Mule-ja ML
+    [mule-ja:08306]
+  * adapt emacsen-install to these update
+  
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Tue, 21 May 2002 22:16:36 +0900
+
+egg (4.0.6+0.20010522cvs-4) unstable; urgency=low
+
+  * cleanup description
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Tue,  7 May 2002 18:29:14 +0900
+
+egg (4.0.6+0.20010522cvs-3) unstable; urgency=low
+
+  * add README.Debian, note about ``egg does not support XEmacs''
+    ``egg with canna'', closes: #143227, #143229
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Fri, 19 Apr 2002 12:06:06 +0900
+
+egg (4.0.6+0.20010522cvs-2) unstable; urgency=low
+
+  * update emacs-install file (cleanup .el directory after install)
+  * fix typo in init.el
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Thu, 11 Oct 2001 23:02:46 +0900
+
+egg (4.0.6+0.20010522cvs-1) unstable; urgency=low
+
+  * Update to current CVS (20010522)
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Wed, 10 Oct 2001 06:45:22 +0900
+
+egg (4.0.6-5) unstable; urgency=low
+
+  * New maintainer (take over from Takuo KITAME)
+  * make distclean instead of make clean in clean target.
+  * add Build-Depends-Indep: debhelper
+  * update Standards-Version to 3.5.6.0
+
+ -- ISHIKAWA Mutsumi <ishikawa@linux.or.jp>  Tue,  9 Oct 2001 12:25:27 +0900
+
+egg (4.0.6-4) unstable; urgency=low
+
+  * hopefully fixed canna problem...
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 10 Oct 2000 08:35:39 +0900
+
+egg (4.0.6-3) unstable; urgency=low
+
+  * remove egg/canna*, it still not work.
+    (remove Conflicts: emacs-dl-canna)
+
+ -- Takuo KITAME <kitame@northeye.org>  Thu, 28 Sep 2000 07:28:19 +0900
+
+egg (4.0.6-2) unstable; urgency=low
+
+  * don't require egg and its/hira in init.el. (closes: Bug#64973)
+
+ -- Takuo KITAME <kitame@northeye.org>  Thu, 24 Aug 2000 11:32:45 +0900
+
+egg (4.0.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 14 Feb 2000 10:09:38 +0900
+
+egg (4.0.2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 10 Jan 2000 20:57:27 +0900
+
+
--- egg-4.0.6+0.20041122cvs.orig/debian/emacsen-remove
+++ egg-4.0.6+0.20041122cvs/debian/emacsen-remove
@@ -0,0 +1,40 @@
+#!/bin/sh
+# /usr/lib/emacsen-common/packages/remove/foo
+# [ This particular script hasn't been tested either, so be careful. ]
+set -e
+
+FLAVOR=$1
+PACKAGE="egg"
+
+if [ "X${FLAVOR}" = "X" ]; then
+    echo Need argument to determin FLAVOR of emacs;
+    exit 1
+fi
+
+if [ "X${PACKAGE}" = "X" ]; then
+    echo Internal error: need package name;
+    exit 1;
+fi
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+STARTDIR=/etc/${FLAVOR}/site-start.d
+STARTFILE="${PACKAGE}-init.el";
+
+SITELISP=/usr/share/${FLAVOR}/site-lisp
+
+case "${FLAVOR}" in
+	emacs)
+
+	;;
+	emacs2*|emacs-snapshot)
+	echo -n "remove/${PACKAGE}: Handling removal of emacsen flavor ${FLAVOR} ..."
+	rm -rf ${ELCDIR}
+	rm -f ${STARTDIR}/50${STARTFILE}*;
+	echo " done."
+	;;
+	*)
+	;;
+esac
+
+exit 0;
--- egg-4.0.6+0.20041122cvs.orig/debian/docs
+++ egg-4.0.6+0.20041122cvs/debian/docs
@@ -0,0 +1,4 @@
+AUTHORS
+README.ja.txt
+TODO
+PROBLEMS
--- egg-4.0.6+0.20041122cvs.orig/debian/control
+++ egg-4.0.6+0.20041122cvs/debian/control
@@ -0,0 +1,18 @@
+Source: egg
+Section: utils
+Priority: extra
+Maintainer: ISHIKAWA Mutsumi <ishikawa@debian.org>
+Build-Depends: debhelper
+Standards-Version: 3.6.1.1
+
+Package: egg
+Architecture: any
+Pre-Depends: make
+Depends: emacs21-nox | emacs21 | emacs-snapshot | emacs-snapshot-gtk | emacs-snapshot-nox
+Conflicts: emacs-dl-wnn
+Suggests: canna, freewnn-jserver, freewnn-cserver, freewnn-kserver, anthy
+Description: Tamago Ver. 4 -- EGG Input Method Architecture for Emacsen
+ Tamago version 4 (aka egg4) is Input Method Architecture for
+ emacsen. All of these is written by elisp (you don't need to modify emacsen).
+ It can use with FreeWnn (jserver, cserver, tserver), Wnn6/Wnn7/Wnn8 jserver,
+ Canna server and Anthy server.
--- egg-4.0.6+0.20041122cvs.orig/debian/dirs
+++ egg-4.0.6+0.20041122cvs/debian/dirs
@@ -0,0 +1,3 @@
+usr/lib/egg
+usr/share/emacs/site-lisp/egg
+etc/emacs/site-start.d
--- egg-4.0.6+0.20041122cvs.orig/debian/emacsen-install
+++ egg-4.0.6+0.20041122cvs/debian/emacsen-install
@@ -0,0 +1,75 @@
+#! /bin/sh -e
+#  /usr/lib/emacsen-common/packages/install/egg
+# [ This particular script hasn't been tested, so be careful. ]
+
+set -e
+
+FLAVOR=$1
+PACKAGE="egg"
+
+if [ "X${FLAVOR}" = "X" ]; then
+    echo Need argument to determin FLAVOR of emacs;
+    exit 1
+fi
+
+if [ "X${PACKAGE}" = "X" ]; then
+    echo Internal error: need package name;
+    exit 1;
+fi
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+STARTDIR=/etc/${FLAVOR}/site-start.d
+STARTFILE="${PACKAGE}-init.el";
+
+SITELISP=/usr/share/${FLAVOR}/site-lisp
+
+EFLAGS="-batch -q --no-site-file --no-init-file -l ./docomp.el -l./jisx0213.el -f batch-byte-compile"
+COMPILE="-batch -q -f batch-byte-compile"
+
+case "${FLAVOR}" in
+	emacs)
+	;;
+	emacs20)
+	AYNU_BUILD=
+	;;
+	emacs21|emacs22|emacs23|emacs-snapshot)
+	AYNU_BUILD=its/aynu.el
+	;;
+esac
+
+case "${FLAVOR}" in
+	emacs)
+	;;
+	emacs2*|emacs-snapshot)
+
+	echo -n "install/${PACKAGE}: Byte-compiling for ${FLAVOR} ..."
+
+	rm -rf ${ELCDIR}
+	install -m 755 -d ${ELCDIR}
+	
+    # Copy the temp .el files (and Makefile or so)
+    # cp -par ${ELDIR}/* ${ELCDIR}/
+	
+    # Byte compile them
+	(cd ${ELDIR}
+	    make AYNU=${AYNU_BUILD} EMACS=${FLAVOR} lispdir=${SITELISP} install clean > CompilationLog 2>&1
+	)
+	
+	mv ${ELDIR}/CompilationLog ${ELCDIR}/
+	gzip -9 ${ELCDIR}/CompilationLog
+	
+	if [ ! -d ${STARTDIR} ]; then
+	    install -m 755 -d ${STARTDIR}
+	fi
+
+	cp ${ELDIR}/${STARTFILE} ${STARTDIR}/50${STARTFILE};
+
+	echo " done."
+	;;
+	*)
+	;;
+esac
+
+exit 0;
--- egg-4.0.6+0.20041122cvs.orig/debian/rules
+++ egg-4.0.6+0.20041122cvs/debian/rules
@@ -0,0 +1,71 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=1
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add here commands to compile the package.
+	#$(MAKE)
+	./configure
+
+	gcc -O2 -o `pwd`/helper/egg-helper `pwd`/helper/egg-helper.c
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	# $(MAKE) install DESTDIR=`pwd`/debian/tmp
+	cp -r eggrc *.el egg its Makefile \
+		`pwd`/debian/tmp/usr/share/emacs/site-lisp/egg/
+	rm -rf `pwd`/debian/tmp/usr/share/emacs/site-lisp/egg/its/CVS
+	rm -rf `pwd`/debian/tmp/usr/share/emacs/site-lisp/egg/egg/CVS
+
+	install -m 644 debian/egg-init.el \
+		 `pwd`/debian/tmp/usr/share/emacs/site-lisp/egg/
+	install -m 755 `pwd`/helper/egg-helper `pwd`/debian/tmp/usr/lib/egg
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installemacsen
+	dh_installinfo
+	dh_installchangelogs ChangeLog ChangeLog.0
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+binary-indep: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- egg-4.0.6+0.20041122cvs.orig/debian/README.Debian
+++ egg-4.0.6+0.20041122cvs/debian/README.Debian
@@ -0,0 +1,19 @@
+egg for DEBIAN
+----------------------
+
+ - Egg4 does not support XEmacs*. Only for Emacs20.5 or later.
+
+ - If you want to use egg4 with Canna.
+    Egg4 canna backend connect to cannaserver using UNIX domain
+    socket per default. On emacs 21.4 (or earlier) canna backend
+    use `egg-helper' helper program to connect cannaserver.
+
+ - If you want to use egg4 with Wnn7/Wnn8
+
+    Some Wnn7/Wnn8 functions (e.g YOSOKU henkan) are not supported yet.
+
+    Default eggrc setting uses computer.dic. It is not included in
+    Wnn7 1.00. Please update Wnn7 1.01(or above), or comment out
+    computer.dic entry in eggrc.
+
+ISHIKAWA Mutsumi <ishikawa@debian.org>
--- egg-4.0.6+0.20041122cvs.orig/debian/copyright
+++ egg-4.0.6+0.20041122cvs/debian/copyright
@@ -0,0 +1,43 @@
+This package was debianized by Takuo KITAME <kitame@northeye.org> on
+Mon, 10 Jan 2000 18:14:38 +0900.
+
+And Taken over this package by ISHIKAWA Mutsumi <ishikawa@debian.org>
+
+It was downloaded from <ftp://ftp.m17n.org/pub/tamago/>
+
+Upstream Authors: see the AUTHORS file
+
+Copyright:
+
+ Please refer /usr/share/common-licenses/GPL-2 about detail of GPL version 2
+
+;;; egg.el --- EGG Input Method Architecture
+
+;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
+
+;; Author: NIIBE Yutaka <gniibe@chroot.org>
+;;         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.
+
+
+
--- egg-4.0.6+0.20041122cvs.orig/debian/egg-init.el
+++ egg-4.0.6+0.20041122cvs/debian/egg-init.el
@@ -0,0 +1,22 @@
+;;
+;; egg-init.el
+;;
+;; Takuo KITAME <kitame@northeye.org>
+;; ISHIKAWA Mutsumi <ishikawa@debian.org>
+;; 
+
+(setq load-path 
+      (cons 
+       (concat "/usr/share/" (symbol-name debian-emacs-flavor)
+              "/site-lisp/egg")
+       load-path))
+
+(setq egg-canna-helper-path "/usr/lib/egg/egg-helper")
+
+;; (set-language-info "Japanese"    'input-method "japanese-egg-wnn")
+
+;;; Try M-x customize-group hira
+
+;;(set-language-info "Chinese-GB"  'input-method "chinese-gb-egg-wnn-py")
+;;(set-language-info "Chinese-CNS" 'input-method "chinese-cns-egg-wnn-py")
+;;(set-language-info "Korean"      'input-method "korean-egg-wnn")
--- egg-4.0.6+0.20041122cvs.orig/debian/compat
+++ egg-4.0.6+0.20041122cvs/debian/compat
@@ -0,0 +1 @@
+4