From owner-ports-jp@jp.freebsd.org  Thu Aug  6 23:52:29 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) id XAA18458;
	Thu, 6 Aug 1998 23:52:29 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from diana.infonets.hiroshima-u.ac.jp (diana.infonets.hiroshima-u.ac.jp [133.41.33.53])
	by jaz.jp.freebsd.org (8.8.8+3.0Wbeta13/8.7.3) with ESMTP id XAA18450
	for <ports-jp@jp.freebsd.org>; Thu, 6 Aug 1998 23:52:27 +0900 (JST)
	(envelope-from taoka@infonets.hiroshima-u.ac.jp)
Received: from cal.infonets.hiroshima-u.ac.jp (cal.infonets.hiroshima-u.ac.jp [133.41.33.61]) by diana.infonets.hiroshima-u.ac.jp (8.8.8/3.6W) with ESMTP
	id XAA20429 for <ports-jp@jp.freebsd.org>; Thu, 6 Aug 1998 23:52:25 +0900 (JST)
Received: from localhost (localhost.infonets.hiroshima-u.ac.jp [127.0.0.1]) by cal.infonets.hiroshima-u.ac.jp (8.8.8/3.6W) with ESMTP
	id XAA00513 for <ports-jp@jp.freebsd.org>; Thu, 6 Aug 1998 23:52:24 +0900 (JST)
To: ports-jp@jp.freebsd.org
From: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
In-Reply-To: Your message of "Thu, 06 Aug 1998 09:11:28 +0900"
	<19980806091128L.mac@flab.fujitsu.co.jp>
References: <19980806091128L.mac@flab.fujitsu.co.jp>
X-Mailer: Mew version 1.92.4 on XEmacs 20.4 (Emerald)
X-URL: http://www.infonets.hiroshima-u.ac.jp/~taoka/
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Thu_Aug__6_23:52:20_1998_809)--"
Content-Transfer-Encoding: 7bit
Message-Id: <19980806235224N.taoka@infonets.hiroshima-u.ac.jp>
Date: Thu, 06 Aug 1998 23:52:24 +0900
X-Dispatcher: imput version 971024
Lines: 175
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+980729
X-Sequence: ports-jp 3937
Subject: [ports-jp 3937] Re: Mule 2.3 based on Emacs 19.34 (Re: ports broken?)
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org

----Next_Part(Thu_Aug__6_23:52:20_1998_809)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit


$BED2,$G$9!#(B

From: Masahide NODA/$B$N$@$^$5$R$G(B <mac@flab.fujitsu.co.jp>
Subject: [ports-jp 3929] Re: Mule 2.3 based on Emacs 19.34 (Re: ports broken?)
Date: Thu, 06 Aug 1998 09:11:28 +0900
Message-ID: <19980806091128L.mac@flab.fujitsu.co.jp>

> 
> mac> $B0l1~(B patch $B$O(B $B0l2U=j$r=|$$$F$"$?$j$^$9$7!"(Breject $B$5$l$kItJ,$b<j$G$"$F$k(B
> mac> $B$3$H$,$G$-$k$s$G$9$,!"$=$N(B egg.el/wnn-egg.el $B$r;HMQ$7$F(B dump $B$7$?(B emacs 
> mac> $B$@$H!"(B*scratch* buffer $B$K(B $B$J$K$+J8;z$rF~$l$FJQ49$7$?8e$^$H$b$JJ8;zF~NO$,(B
> mac> $B$G$-$J$$>uBV$K$J$C$F$7$^$$$^$9!#(B

$BJR;3!w(BPFU$B$5$s$KAjCL$7$F!"BP:v$r$7$FD:$-$^$7$?!#(B

$B7k6I!"(Begg.el$B$NMQ$K(Bwnn-egg.el$B$K(B

+
+(or (assq 'egg:henkan-mode-in-use minor-mode-map-alist)
+    (setq minor-mode-map-alist
+         (cons (cons 'egg:henkan-mode-in-use henkan-mode-map)
+               minor-mode-map-alist)))
+

$B$rDI2C$9$l$PNI$+$C$?$h$&$G$9!#(B

$BNc$N(Bports$B$G!"(Bmake patch$B$7$?8e!"E:IU$7$?%Q%C%A$r(Bwork/emacs-19.34$B$N$7$?$G(B
$BEv$F$F$/$@$5$$!#(B

$B?7$7$$(Bmew$B$O;n$7$F$^$;$s$,!"IaDL$NF~NO$O$G$-$^$7$?!#(B



----Next_Part(Thu_Aug__6_23:52:20_1998_809)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: egg.el-19.34.patch-for_takana.patch

diff -ru egg.orig/egg.el lisp/egg.el
--- egg.orig/egg.el	Wed Aug  5 14:44:38 1998
+++ lisp/egg.el	Thu Aug  6 22:47:18 1998
@@ -2477,9 +2477,6 @@
 (make-variable-buffer-local 'egg:*region-end*)
 (set-default 'egg:*region-start* nil)
 (set-default 'egg:*region-end* nil)
-(defvar egg:*global-map-backup* nil)
-(defvar egg:*local-map-backup*  nil)
-
 
 ;;;
 ;;; (defvar disable-undo nil "*Compatibility for Nemacs")
@@ -2609,11 +2606,6 @@
   (and (boundp 'disable-undo) (setq disable-undo t))
   (setq egg:*in-fence-mode* t)
   (egg:mode-line-display)
-  ;;;(setq egg:*global-map-backup* (current-global-map))
-  (setq egg:*local-map-backup*  (current-local-map))
-  ;;;(use-global-map fence-mode-map)
-  ;;;(use-local-map nil)
-  (use-local-map fence-mode-map)
   (egg:check-fence-in-cont)            ; for Wnn6
   (insert egg:*fence-open*)
   (or (markerp egg:*region-start*) (setq egg:*region-start* (make-marker)))
@@ -2728,8 +2720,6 @@
 correspoding to character position.")
 
 (defun egg:quit-egg-mode ()
-  ;;;(use-global-map egg:*global-map-backup*)
-  (use-local-map egg:*local-map-backup*)
   (setq egg:*in-fence-mode* nil)
   (egg:mode-line-display)
   (if overwrite-mode
@@ -2826,6 +2816,10 @@
 (define-key fence-mode-map [kp-right] 'fence-forward-char)
 (define-key fence-mode-map [kp-left] 'fence-backward-char)
 
+(or (assq 'egg:*in-fence-mode* minor-mode-map-alist)
+    (setq minor-mode-map-alist
+	  (cons (cons 'egg:*in-fence-mode* fence-mode-map)
+		minor-mode-map-alist)))
 
 ;;;----------------------------------------------------------------------
 ;;;
diff -ru egg.orig/wnn-egg.el lisp/wnn-egg.el
--- egg.orig/wnn-egg.el	Wed Aug  5 14:44:38 1998
+++ lisp/wnn-egg.el	Thu Aug  6 22:25:46 1998
@@ -283,11 +283,6 @@
   (and (boundp 'disable-undo) (setq disable-undo t))
   (setq egg:*in-fence-mode* t)
   (egg:mode-line-display)
-  ;;;(setq egg:*global-map-backup* (current-global-map))
-  (setq egg:*local-map-backup*  (current-local-map))
-  ;;;(use-global-map fence-mode-map)
-  ;;;(use-local-map nil)
-  (use-local-map fence-mode-map)
   (egg:check-fence-in-cont)            ; for Wnn6
   (insert egg:*fence-open*)
   (or (markerp egg:*region-start*) (setq egg:*region-start* (make-marker)))
@@ -1012,8 +1007,6 @@
 			    (set-marker-insertion-type egg:*region-end* t)))
 		      (if (null (marker-position egg:*region-start*))
 			  (progn
-			    ;;;(setq egg:*global-map-backup* (current-global-map))
-			    (setq egg:*local-map-backup* (current-local-map))
 			    (and (boundp 'disable-undo) (setq disable-undo t))
 			    (delete-region start end)
 			    (goto-char start)
@@ -1043,9 +1036,6 @@
 		      (egg:henkan-face-on)
 		      (egg:bunsetu-face-on)
 		      (henkan-goto-bunsetu 0)
-		      ;;;(use-global-map henkan-mode-map)
-		      ;;;(use-local-map nil)
-		      (use-local-map henkan-mode-map)
 		      (run-hooks 'egg:henkan-start-hook)
 		      (setq finished t))
 		  (beep)))))
@@ -1262,10 +1252,7 @@
     ;;;(set-marker egg:*region-end* (point))
     (goto-char point))
   (setq egg:*mode-on* t)
-  ;;;(use-global-map fence-mode-map)
-  ;;;(use-local-map  nil)
   (setq egg:henkan-mode-in-use nil)
-  (use-local-map fence-mode-map)
   (egg:mode-line-display))
 
 (defun sai-henkan ()
@@ -1277,7 +1264,6 @@
 	 (setq egg:henkan-mode-in-use t)
 	 (mode-line-egg-mode-update (egg:msg-get 'henkan-mode-indicator))
 	 (goto-char egg:*sai-henkan-start*)
-	 (setq egg:*local-map-backup* (current-local-map))
 	 (and (boundp 'disable-undo) (setq disable-undo t))
 	 (delete-region egg:*sai-henkan-start* egg:*sai-henkan-end*)
 	 (goto-char egg:*sai-henkan-start*)
@@ -1290,7 +1276,6 @@
 	 (egg:henkan-face-on)
 	 (egg:bunsetu-face-on)
 	 (henkan-goto-bunsetu 0)
-	 (use-local-map henkan-mode-map)
 	 (setq finished t))
        (or finished (setq disable-undo nil) (setq egg:henkan-mode-in-use nil)))))
   )
@@ -1527,10 +1512,7 @@
   (egg:fence-face-on)
   (wnn-server-henkan-quit)
   (setq egg:*mode-on* t)
-  ;;;(use-global-map fence-mode-map)
-  ;;;(use-local-map  nil)
   (setq egg:henkan-mode-in-use nil)
-  (use-local-map fence-mode-map)
   (egg:mode-line-display)
   )
 
@@ -1653,6 +1635,12 @@
 (define-key henkan-mode-map [kp-left] 'henkan-backward-bunsetu)
 (define-key henkan-mode-map [kp-down] 'henkan-next-kouho)
 (define-key henkan-mode-map [kp-up] 'henkan-previous-kouho)
+
+(or (assq 'egg:henkan-mode-in-use minor-mode-map-alist)
+    (setq minor-mode-map-alist
+	  (cons (cons 'egg:henkan-mode-in-use henkan-mode-map)
+		minor-mode-map-alist)))
+
 
 (defun henkan-help-command ()
   "Display documentation for henkan-mode."

----Next_Part(Thu_Aug__6_23:52:20_1998_809)----
