--- egg.el.orig	Thu Aug  6 19:55:00 1998
+++ egg.el	Mon Aug 10 13:09:14 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,12 @@
 (define-key fence-mode-map [kp-right] 'fence-forward-char)
 (define-key fence-mode-map [kp-left] 'fence-backward-char)
 
+(fset 'fence-mode-map fence-mode-map)
+
+(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)))
 
 ;;;----------------------------------------------------------------------
 ;;;
--- wnn-egg.el.orig	Thu Aug  6 19:55:00 1998
+++ wnn-egg.el	Mon Aug 10 13:13:23 1998
@@ -211,16 +211,17 @@
   (egg:mode-line-display)
   (run-hooks 'its:select-mode-hook))
 
-(defvar its:select-mode-hook
-  (lambda ()
-    (setq its:*current-map* its:*current-map*)
-    (let ((server (map-server its:*current-map*))
-	  (hook (map-hook its:*current-map*)))
-      (if (null server)
-	  (setq server wnn-server-type))
-      (setq wnn-server-type server
-	    fence-mode-map (get-fence-mode-map server))
-      (if hook (funcall hook)))))
+(defvar its:select-mode-hook)
+(add-hook 'its:select-mode-hook
+	  (lambda ()
+	    (setq its:*current-map* its:*current-map*)
+	    (let ((server (map-server its:*current-map*))
+		  (hook (map-hook its:*current-map*)))
+	      (setq server (or server wnn-server-type)
+		    wnn-server-type server)
+	      (fset 'fence-mode-map
+		    (setq fence-mode-map (get-fence-mode-map server)))
+	      (if hook (funcall hook)))))
 
 (defun its:next-mode ()
   (interactive)
@@ -283,11 +284,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 +1008,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 +1037,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 +1253,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 +1265,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 +1277,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 +1513,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 +1636,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."