- Use fboundp instead of boundp to check binding of

  deactivate-input-method.

- Remove an extra flag for test(1) in Makefile.in.

- Use with-current-buffer instead of a save-excursion + set-buffer pair.

- Fix (fboundp finalize) in egg/wnn.el and egg/canna.el.

- Remove HAS_JISX0213 check.

- Nuke *.el files from plist.

14 files changed, 200 insertions, 72 deletions

diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 9101dca0021d..4274c4543cb6 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
@@ -31,13 +31,7 @@ PORTDOCS=	AUTHORS ChangeLog ChangeLog.1997-1998 \
 		README.Debian changelog.Debian
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_PORT_NAME:Memacs2[1234]}
-PLIST_SUB+=	HAS_JISX0213=""
-.else
-PLIST_SUB+=	HAS_JISX0213="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 post-build:
 	cd ${WRKSRC}/helper && \
@@ -54,4 +48,4 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/tamago/files/patch-Makefile.in b/editors/tamago/files/patch-Makefile.in
index a75dee0255ef..61a5eb0726e9 100644
--- a/editors/tamago/files/patch-Makefile.in
+++ b/editors/tamago/files/patch-Makefile.in
@@ -1,11 +1,21 @@
 --- Makefile.in.orig	2015-01-31 19:24:09.000000000 +0900
-+++ Makefile.in	2015-01-31 19:25:52.000000000 +0900
-@@ -115,32 +115,32 @@
++++ Makefile.in	2015-02-02 01:32:47.000000000 +0900
+@@ -54,8 +54,7 @@
+ 	egg-sim.el \
+ 	menudiag.el \
+ 	its.el \
+-	its-keydef.el \
+-	leim-list.el \
++	its-keydef.el
+ 
+ #
+ EGGSRCS	= \
+@@ -115,32 +114,32 @@
  
  install-site: all
  	echo "Egg system will be installed in ${lispdir}/egg...."; \
 -	if [ -d ${lispdir}/egg ]; then \
-+	if [ -d -p ${DESTDIR}${lispdir}/egg ]; then \
++	if [ -d ${DESTDIR}${lispdir}/egg ]; then \
  	  echo "Clean up the previsous installation...."; \
 -	  rm -rf ${lispdir}/egg/*;  \
 +	  rm -rf ${DESTDIR}${lispdir}/egg/*;  \
@@ -15,15 +25,17 @@
 +	  mkdir -p ${DESTDIR}${lispdir}/egg; \
  	fi; \
  #
- 	for FILE in ${TOPSRCS} ${TOPELCS} ${INITELS}; \
+-	for FILE in ${TOPSRCS} ${TOPELCS} ${INITELS}; \
++	for FILE in ${TOPELCS} ${INITELS}; \
  	  do  \
 -	    ${INSTALL_DATA}  $${FILE} ${lispdir}/egg/; \
 +	    ${INSTALL_DATA}  $${FILE} ${DESTDIR}${lispdir}/egg/; \
  	  done; \
  #
 -	mkdir ${lispdir}/egg/egg ; \
+-	for FILE in ${EGGSRCS} ${EGGELCS} ; \
 +	mkdir -p ${DESTDIR}${lispdir}/egg/egg ; \
- 	for FILE in ${EGGSRCS} ${EGGELCS} ; \
++	for FILE in ${EGGELCS} ; \
  	  do  \
 -	    ${INSTALL_DATA}  $${FILE} ${lispdir}/egg/egg; \
 +	    ${INSTALL_DATA}  $${FILE} ${DESTDIR}${lispdir}/egg/egg; \
@@ -32,8 +44,9 @@
 +	touch ${DESTDIR}${lispdir}/egg/egg/.nosearch; \
  #
 -	mkdir ${lispdir}/egg/its ; \
+-	for FILE in ${ITSSRCS} ${ITSELCS} ; \
 +	mkdir -p ${DESTDIR}${lispdir}/egg/its ; \
- 	for FILE in ${ITSSRCS} ${ITSELCS} ; \
++	for FILE in ${ITSELCS} ; \
  	  do  \
 -	    ${INSTALL_DATA}  $${FILE} ${lispdir}/egg/its ; \
 +	    ${INSTALL_DATA}  $${FILE} ${DESTDIR}${lispdir}/egg/its ; \
diff --git a/editors/tamago/files/patch-egg-anthy.el b/editors/tamago/files/patch-egg-anthy.el
index a5173376a6fc..ff2107ec5b38 100644
--- a/editors/tamago/files/patch-egg-anthy.el
+++ b/editors/tamago/files/patch-egg-anthy.el
@@ -1,6 +1,6 @@
 --- egg/anthy.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg/anthy.el	2015-01-31 19:39:19.000000000 +0900
-@@ -146,7 +146,7 @@
++++ egg/anthy.el	2015-02-02 00:32:09.000000000 +0900
+@@ -146,12 +146,11 @@
  		     (if anthy-egg-use-utf8
  			 '("--egg" "--utf8")
  		       '("--egg"))))
@@ -9,3 +9,19 @@
  	(set-process-coding-system anthy-egg-proc cs cs)
  	(set-process-sentinel anthy-egg-proc 'anthy-egg-proc-sentinel)
  	(set-marker-insertion-type (process-mark anthy-egg-proc) t)
+-	(save-excursion
+-	  (set-buffer buf)
++	(with-current-buffer buf
+ 	  (erase-buffer)
+ 	  (buffer-disable-undo))
+ 	(anthyipc-get-greeting anthy-egg-proc)))
+@@ -404,8 +403,7 @@
+   (let ((buf (get-buffer-create anthy-egg-dic-buffer-name))
+ 	(cs (if anthy-egg-use-utf8 'utf-8-unix 'euc-japan-unix))
+ 	proc)
+-    (save-excursion
+-      (set-buffer buf)
++    (with-current-buffer buf
+       (setq proc (apply 'start-process "anthy-egg-dic" buf
+ 			anthy-egg-dic-util-command
+ 			(if anthy-egg-use-utf8
diff --git a/editors/tamago/files/patch-egg-anthyipc.el b/editors/tamago/files/patch-egg-anthyipc.el
new file mode 100644
index 000000000000..f5922f70f3e9
--- /dev/null
+++ b/editors/tamago/files/patch-egg-anthyipc.el
@@ -0,0 +1,12 @@
+--- egg/anthyipc.el.orig	2015-01-31 19:24:09.000000000 +0900
++++ egg/anthyipc.el	2015-02-02 00:32:22.000000000 +0900
+@@ -46,8 +46,7 @@
+ 	  ,@vlist)
+      (if (and (eq (process-status proc) 'run)
+ 	      (buffer-live-p buffer))
+-	 (save-excursion
+-	   (set-buffer buffer)
++	 (with-current-buffer buffer
+ 	   (erase-buffer)
+ 	   ,send-expr
+ 	   (goto-char (point-max))
diff --git a/editors/tamago/files/patch-egg-canna.el b/editors/tamago/files/patch-egg-canna.el
index 4684eeab0fa8..9ce890dfb8b0 100644
--- a/editors/tamago/files/patch-egg-canna.el
+++ b/editors/tamago/files/patch-egg-canna.el
@@ -1,6 +1,25 @@
 --- egg/canna.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg/canna.el	2015-01-31 19:39:19.000000000 +0900
-@@ -337,7 +337,7 @@
++++ egg/canna.el	2015-02-02 00:52:59.000000000 +0900
+@@ -134,7 +134,7 @@
+ (defun canna-make-backend (lang env &optional source-lang converted-lang)
+   (let ((finalize (canna-backend-func-name "canna-finalize-backend" lang))
+ 	(backend (canna-backend-func-name "canna-backend" lang env)))
+-    (if (null (fboundp finalize))
++    (if (null (fboundp 'finalize))
+ 	(progn
+ 	  (fset finalize (function (lambda () (canna-finalize-backend))))
+ 	  (egg-set-finalize-backend (list finalize))))
+@@ -319,8 +319,7 @@
+     (unwind-protect
+ 	(progn
+ 	  (setq buf (generate-new-buffer " *CANNA*"))
+-    (save-excursion
+-      (set-buffer buf)
++    (with-current-buffer buf
+       (erase-buffer)
+       (buffer-disable-undo)
+ 	    (set-buffer-multibyte nil)
+@@ -337,7 +336,7 @@
  		    (setq port (substring hostname (match-end 0))
  			  hostname (substring hostname 0 (match-beginning 0))))
  		  (if (and (stringp port) (string-match "^[0-9]+$" port))
@@ -9,7 +28,7 @@
  		  (and (equal hostname "")
  		       (setq hostname (or (getenv "CANNAHOST") "localhost")))
  		  (setq host hostname)
-@@ -367,7 +367,7 @@
+@@ -367,7 +366,7 @@
  		      (setq proc (open-network-stream proc-name buf hostname port))
  		    (error quit)))))
  	    (when (processp proc)
@@ -18,7 +37,7 @@
  	      (set-process-coding-system proc 'binary 'binary)
  	      (set-process-sentinel proc 'canna-comm-sentinel)
  	      (set-marker-insertion-type (process-mark proc) t)
-@@ -869,7 +869,7 @@
+@@ -869,7 +868,7 @@
      (setq kouho-list (cdr (reverse kouho-list)))
      (setq kouho-list (reverse kouho-list))
      (setq i 0)
diff --git a/editors/tamago/files/patch-egg-cannarpc.el b/editors/tamago/files/patch-egg-cannarpc.el
new file mode 100644
index 000000000000..9586a0131851
--- /dev/null
+++ b/editors/tamago/files/patch-egg-cannarpc.el
@@ -0,0 +1,12 @@
+--- egg/cannarpc.el.orig	2015-01-31 19:23:34.000000000 +0900
++++ egg/cannarpc.el	2015-02-02 00:32:59.000000000 +0900
+@@ -79,8 +79,7 @@
+     (list
+      'let v
+      (append
+-	`(save-excursion
+-	   (set-buffer (process-buffer proc))
++	`(with-current-buffer (process-buffer proc)
+ 	   (erase-buffer)
+ 	   ,send-expr
+ 	   (process-send-region proc (point-min) (point-max))
diff --git a/editors/tamago/files/patch-egg-com.el b/editors/tamago/files/patch-egg-com.el
index 64743cbb8079..a088d9f36fa3 100644
--- a/editors/tamago/files/patch-egg-com.el
+++ b/editors/tamago/files/patch-egg-com.el
@@ -1,5 +1,5 @@
 --- egg-com.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg-com.el	2015-01-31 19:25:52.000000000 +0900
++++ egg-com.el	2015-02-02 00:29:50.000000000 +0900
 @@ -99,9 +99,10 @@
      (prog1 (- (point) pos)
        (goto-char pos))))
@@ -66,7 +66,17 @@
  
  (defconst egg-pinyin-shengmu
    '((""  . 0)  ("B" . 1)  ("C"  . 2)  ("Ch" . 3)  ("D" . 4)
-@@ -828,9 +848,10 @@
+@@ -578,8 +598,7 @@
+     (set-buffer work)
+     (erase-buffer)
+     (if (null (stringp from))
+-	(save-excursion
+-	  (set-buffer buf)
++	(with-current-buffer buf
+ 	  (setq from (buffer-substring from to))))
+     (insert (string-as-multibyte from))
+     (encode-fixed-euc-china-region 1 (point-max) type)
+@@ -828,9 +847,10 @@
  ;; Do not move the point, leave it where it was.
  (defmacro comm-accept-process-output ()
    `(let ((p (point)))
@@ -80,7 +90,7 @@
  
  (defmacro comm-require-process-output (n)
    `(if (< (point-max) (+ (point) ,n))
-@@ -839,10 +860,11 @@
+@@ -839,10 +859,11 @@
  (defun comm-wait-for-space (proc n)
    (let ((p (point))
  	(r (+ (point) n)))
@@ -96,3 +106,13 @@
  
  (defmacro comm-following+forward-char ()
    `(prog1
+@@ -967,8 +988,7 @@
+ 	  ,@vlist)
+      (if (and (memq (process-status proc) '(open run))
+ 	      (buffer-live-p buffer))
+-	 (save-excursion
+-	   (set-buffer buffer)
++	 (with-current-buffer buffer
+ 	   (let ,euc-select
+ 	     (erase-buffer)
+ 	     ,send-expr
diff --git a/editors/tamago/files/patch-egg-sj3.el b/editors/tamago/files/patch-egg-sj3.el
index d73b8dede330..1b0814534ea5 100644
--- a/editors/tamago/files/patch-egg-sj3.el
+++ b/editors/tamago/files/patch-egg-sj3.el
@@ -1,6 +1,6 @@
 --- egg/sj3.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ egg/sj3.el	2015-01-31 19:25:52.000000000 +0900
-@@ -146,7 +146,7 @@
++++ egg/sj3.el	2015-02-02 00:33:30.000000000 +0900
+@@ -146,11 +146,10 @@
  	(setq proc (open-network-stream "SJ3" buf hostname sj3-server-port))
        ((error quit)
         (egg-error "failed to connect sj3 server")))
@@ -8,4 +8,19 @@
 +    (set-process-query-on-exit-flag proc nil)
      (set-process-coding-system proc 'binary 'binary)
      (set-marker-insertion-type (process-mark proc) t)
-     (save-excursion
+-    (save-excursion
+-      (set-buffer buf)
++    (with-current-buffer buf
+       (erase-buffer)
+       (buffer-disable-undo)
+       (set-buffer-multibyte nil))
+@@ -177,8 +176,7 @@
+ ;;   (let* ((buf (generate-new-buffer " *SJ3*"))
+ ;; 	 (msg-form "SJ3: connecting to sj3serv at %s...")
+ ;; 	 hostname proc result msg)
+-;;     (save-excursion
+-;;       (set-buffer buf)
++;;     (with-current-buffer buf
+ ;;       (erase-buffer)
+ ;;       (buffer-disable-undo)
+ ;;       (setq enable-multibyte-characters nil))
diff --git a/editors/tamago/files/patch-egg-sj3rpc.el b/editors/tamago/files/patch-egg-sj3rpc.el
new file mode 100644
index 000000000000..c2b611435fb5
--- /dev/null
+++ b/editors/tamago/files/patch-egg-sj3rpc.el
@@ -0,0 +1,12 @@
+--- egg/sj3rpc.el.orig	2015-01-31 19:23:34.000000000 +0900
++++ egg/sj3rpc.el	2015-02-02 00:33:47.000000000 +0900
+@@ -86,8 +86,7 @@
+     (list
+      'let v
+      (append
+-	`(save-excursion
+-	   (set-buffer (process-buffer proc))
++	`(with-current-buffer (process-buffer proc)
+ 	   (erase-buffer)
+ 	   ,send-expr
+ 	   (process-send-region proc (point-min) (point-max))
diff --git a/editors/tamago/files/patch-egg-wnn.el b/editors/tamago/files/patch-egg-wnn.el
index c6e7061711ec..2045e910905c 100644
--- a/editors/tamago/files/patch-egg-wnn.el
+++ b/editors/tamago/files/patch-egg-wnn.el
@@ -1,5 +1,5 @@
 --- egg/wnn.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg/wnn.el	2015-01-31 19:55:02.000000000 +0900
++++ egg/wnn.el	2015-02-02 00:53:09.000000000 +0900
 @@ -82,6 +82,10 @@
  			     (const wnn-uniq)
  			     (const wnn-uniq-kanji)))
@@ -33,6 +33,15 @@
  (defmacro wnn-backend-plist ()
    ''(egg-initialize-backend        wnn-init
       egg-start-conversion          wnn-start-conversion
+@@ -128,7 +142,7 @@
+ (defun wnn-make-backend (lang env &optional source-lang converted-lang)
+   (let ((finalize (wnn-backend-func-name "wnn-finalize-backend" lang))
+ 	(backend (wnn-backend-func-name "wnn-backend" lang env)))
+-    (if (null (fboundp finalize))
++    (if (null (fboundp 'finalize))
+ 	(progn
+ 	  (fset finalize `(lambda () (wnn-finalize-backend ',lang)))
+ 	  (egg-set-finalize-backend (list finalize))))
 @@ -559,11 +573,11 @@
  	  bunsetsu))
  
@@ -69,7 +78,7 @@
  
  (defconst wnn-accept-charset-alist
    '((Chinese-CNS ascii chinese-sisheng chinese-cns11643-1 chinese-cns11643-2)))
-@@ -1209,9 +1227,11 @@
+@@ -1209,14 +1227,15 @@
  	(port (wnn-server-port server-info))
  	(hostname-list (wnn-server-hostname server-info))
  	(proc-name (wnn-server-proc-name server-info))
@@ -82,7 +91,13 @@
      (unwind-protect
  	(progn
  	  (setq buf (generate-new-buffer (wnn-server-buffer-name server-info)))
-@@ -1225,13 +1245,24 @@
+-	  (save-excursion
+-	    (set-buffer buf)
++	  (with-current-buffer buf
+ 	    (erase-buffer)
+ 	    (buffer-disable-undo)
+ 	    (set-buffer-multibyte nil)
+@@ -1225,13 +1244,24 @@
  	      (setq hostname-list (list hostname-list)))
  	  (while (and hostname-list (null proc))
  	    (setq hostname (or (car hostname-list) "")
@@ -114,7 +129,7 @@
  	    (let ((inhibit-quit save-inhibit-quit))
  	      (if (and msg
  		       (null (y-or-n-p (format "%s failed. Try to %s? "
-@@ -1241,16 +1272,22 @@
+@@ -1241,16 +1271,22 @@
  			      server-type hostname))
  	    (message "%s" msg)
  	    (let ((inhibit-quit save-inhibit-quit))
diff --git a/editors/tamago/files/patch-egg-wnnrpc.el b/editors/tamago/files/patch-egg-wnnrpc.el
index f5cbf240dcff..404e4228ea2c 100644
--- a/editors/tamago/files/patch-egg-wnnrpc.el
+++ b/editors/tamago/files/patch-egg-wnnrpc.el
@@ -1,5 +1,5 @@
 --- egg/wnnrpc.el.orig	2015-01-31 19:24:10.000000000 +0900
-+++ egg/wnnrpc.el	2015-01-31 19:25:52.000000000 +0900
++++ egg/wnnrpc.el	2015-02-02 00:34:15.000000000 +0900
 @@ -714,8 +714,14 @@
       ,send-expr ,@rcv-exprs))
  
@@ -17,3 +17,13 @@
       (if (< result 0)
         (progn
  	 (comm-unpack (i) result)
+@@ -1716,8 +1722,7 @@
+ 		  (insert contents)
+ 		  (if (= result 2)
+ 		      (insert-file-contents local-filename nil (1- (point))))
+-		  (save-excursion
+-		    (set-buffer (process-buffer proc))
++		  (with-current-buffer (process-buffer proc)
+ 		    (wnnrpc-get-result)))))))))
+     ((quit error)
+      (wnnrpc-call-with-environment env ()
diff --git a/editors/tamago/files/patch-egg.el b/editors/tamago/files/patch-egg.el
index ad417ebeec3f..91e85c950809 100644
--- a/editors/tamago/files/patch-egg.el
+++ b/editors/tamago/files/patch-egg.el
@@ -1,11 +1,26 @@
 --- egg.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg.el	2015-01-31 19:48:25.000000000 +0900
++++ egg.el	2015-02-02 00:38:37.000000000 +0900
+@@ -120,10 +120,10 @@
+ 
+ (defun egg-activate-keymap-after-command ()
+   (while egg-change-major-mode-buffer
+-    (save-excursion
+-      (when (buffer-live-p (car egg-change-major-mode-buffer))
+-	(set-buffer (car egg-change-major-mode-buffer))
+-	(egg-activate-keymap))
++    (let ((buf (car egg-change-major-mode-buffer)))
++      (if (buffer-live-p buf)
++          (with-current-buffer buf
++            (egg-activate-keymap)))
+       (setq egg-change-major-mode-buffer (cdr egg-change-major-mode-buffer))))
+   (remove-hook 'post-command-hook 'egg-activate-keymap-after-command))
+ 
 @@ -167,16 +167,22 @@
  	  (setq egg-modefull-mode t)
  	  (its-define-select-keys egg-modefull-map))
        (setq egg-modeless-mode t))
 -    (setq inactivate-current-input-method-function 'egg-mode)
-+    (set (if (boundp 'deactivate-current-input-method-function)
++    (set (if (fboundp 'deactivate-current-input-method-function)
 +	     'deactivate-current-input-method-function
 +	   'inactivate-current-input-method-function)
 +	 'egg-mode)
@@ -20,7 +35,7 @@
  
  (defun egg-exit-from-minibuffer ()
 -  (inactivate-input-method)
-+  (if (boundp 'deactivate-input-method)
++  (if (fboundp 'deactivate-input-method)
 +      (deactivate-input-method)
 +    (inactivate-input-method))
    (if (<= (minibuffer-depth) 1)
diff --git a/editors/tamago/files/patch-menudiag.el b/editors/tamago/files/patch-menudiag.el
index c3fc73b8bf93..9986163652b1 100644
--- a/editors/tamago/files/patch-menudiag.el
+++ b/editors/tamago/files/patch-menudiag.el
@@ -1,5 +1,5 @@
 --- menudiag.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ menudiag.el	2015-01-31 19:25:52.000000000 +0900
++++ menudiag.el	2015-02-02 00:30:59.000000000 +0900
 @@ -226,6 +226,9 @@
    (remove-hook 'minibuffer-setup-hook 'menudiag-minibuffer-hook)
    (setq menudiag-minibuffer-list (cons (current-buffer)
@@ -42,7 +42,7 @@
      (pop-to-buffer org-buf)
      (while (and item-list (>= n (length (car item-list))))
        (setq l (1+ l)
-@@ -619,7 +623,7 @@
+@@ -619,15 +623,14 @@
    (unless (eq last-command 'menudiag-selection-goto)
      (setq menudiag-goto-number-list nil
  	  menudiag-original-point (point)))
@@ -51,3 +51,12 @@
  					menudiag-goto-number-list))
    (menudiag-selection-goto-internal))
  
+ (defun menudiag-selection-goto-internal ()
+   (let* ((list menudiag-goto-number-list)
+ 	 (n (menudiag-selection-item-number list))
+-	 (len (save-excursion
+-		(set-buffer menudiag-selection-main-buffer)
++	 (len (with-current-buffer menudiag-selection-main-buffer
+ 		(length menudiag-current-items))))
+     (setq this-command 'menudiag-selection-goto)
+     (if (>= n len)
diff --git a/editors/tamago/pkg-plist b/editors/tamago/pkg-plist
index cae994858a71..ec33364afb3b 100644
--- a/editors/tamago/pkg-plist
+++ b/editors/tamago/pkg-plist
@@ -1,72 +1,38 @@
 bin/egg-helper
-%%ELISPDIR%%/egg/egg-cnv.el
 %%ELISPDIR%%/egg/egg-cnv.elc
-%%ELISPDIR%%/egg/egg-com.el
 %%ELISPDIR%%/egg/egg-com.elc
-%%ELISPDIR%%/egg/egg-edep.el
 %%ELISPDIR%%/egg/egg-edep.elc
-%%ELISPDIR%%/egg/egg-mlh.el
 %%ELISPDIR%%/egg/egg-mlh.elc
-%%ELISPDIR%%/egg/egg-sim.el
 %%ELISPDIR%%/egg/egg-sim.elc
-%%ELISPDIR%%/egg/egg.el
 %%ELISPDIR%%/egg/egg.elc
 %%ELISPDIR%%/egg/egg/.nosearch
-%%ELISPDIR%%/egg/egg/anthy.el
 %%ELISPDIR%%/egg/egg/anthy.elc
-%%ELISPDIR%%/egg/egg/anthyipc.el
 %%ELISPDIR%%/egg/egg/anthyipc.elc
-%%ELISPDIR%%/egg/egg/canna.el
 %%ELISPDIR%%/egg/egg/canna.elc
-%%ELISPDIR%%/egg/egg/cannarpc.el
 %%ELISPDIR%%/egg/egg/cannarpc.elc
-%%ELISPDIR%%/egg/egg/sj3.el
 %%ELISPDIR%%/egg/egg/sj3.elc
-%%ELISPDIR%%/egg/egg/sj3rpc.el
 %%ELISPDIR%%/egg/egg/sj3rpc.elc
-%%ELISPDIR%%/egg/egg/wnn.el
 %%ELISPDIR%%/egg/egg/wnn.elc
-%%ELISPDIR%%/egg/egg/wnnrpc.el
 %%ELISPDIR%%/egg/egg/wnnrpc.elc
 %%ELISPDIR%%/egg/eggrc
-%%ELISPDIR%%/egg/its-keydef.el
 %%ELISPDIR%%/egg/its-keydef.elc
-%%ELISPDIR%%/egg/its.el
 %%ELISPDIR%%/egg/its.elc
 %%ELISPDIR%%/egg/its/.nosearch
-%%ELISPDIR%%/egg/its/ascii.el
 %%ELISPDIR%%/egg/its/ascii.elc
-%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.el
-%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.elc
-%%ELISPDIR%%/egg/its/bixing.el
+%%ELISPDIR%%/egg/its/aynu.elc
 %%ELISPDIR%%/egg/its/bixing.elc
-%%ELISPDIR%%/egg/its/erpin.el
 %%ELISPDIR%%/egg/its/erpin.elc
-%%ELISPDIR%%/egg/its/greek.el
 %%ELISPDIR%%/egg/its/greek.elc
-%%ELISPDIR%%/egg/its/hangul.el
 %%ELISPDIR%%/egg/its/hangul.elc
-%%ELISPDIR%%/egg/its/hankata.el
 %%ELISPDIR%%/egg/its/hankata.elc
-%%ELISPDIR%%/egg/its/hira.el
 %%ELISPDIR%%/egg/its/hira.elc
-%%ELISPDIR%%/egg/its/jeonkak.el
 %%ELISPDIR%%/egg/its/jeonkak.elc
-%%ELISPDIR%%/egg/its/jiskana.el
 %%ELISPDIR%%/egg/its/jiskana.elc
-%%ELISPDIR%%/egg/its/kata.el
 %%ELISPDIR%%/egg/its/kata.elc
-%%ELISPDIR%%/egg/its/pinyin.el
 %%ELISPDIR%%/egg/its/pinyin.elc
-%%ELISPDIR%%/egg/its/quanjiao.el
 %%ELISPDIR%%/egg/its/quanjiao.elc
-%%ELISPDIR%%/egg/its/thai.el
 %%ELISPDIR%%/egg/its/thai.elc
-%%ELISPDIR%%/egg/its/zenkaku.el
 %%ELISPDIR%%/egg/its/zenkaku.elc
-%%ELISPDIR%%/egg/its/zhuyin.el
 %%ELISPDIR%%/egg/its/zhuyin.elc
 %%ELISPDIR%%/egg/leim-list.el
-%%ELISPDIR%%/egg/leim-list.elc
-%%ELISPDIR%%/egg/menudiag.el
 %%ELISPDIR%%/egg/menudiag.elc