rearrangement.

diff --git a/mime-edit.el b/mime-edit.el
index a4108ce..f16af45 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -9,7 +9,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1994/08/21 renamed from mime.el by UMEDA Masanobu;
 ;;;          1996/05/24 renamed from tm-edit.el
-;;; Version: $Revision: 0.35 $
+;;; Version: $Revision: 0.36 $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual
 ;;;
 ;;; This file is part of SEMI (September, Emacs MIME Interface)
@@ -123,7 +123,7 @@
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: mime-edit.el,v 0.35 1996-07-10 12:05:05 morioka Exp $")
+  "$Id: mime-edit.el,v 0.36 1996-07-11 14:16:32 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -516,9 +516,6 @@ Tspecials means any character that matches with it in header must be quoted.")
 (defconst mime-editor/mime-map (make-sparse-keymap)
   "Keymap for MIME commands.")
 
-(defconst mime-editor/minor-mime-map nil
-  "Keymap for MIME commands.")
-
 ;;; @ keymap and menu
 ;;;
 
@@ -553,12 +550,6 @@ Tspecials means any character that matches with it in header must be quoted.")
 
 (mime-editor/define-keymap mime-editor/mime-map)
 
-(if mime-editor/minor-mime-map
-    ()
-  (setq mime-editor/minor-mime-map 
-       (make-sparse-keymap 'mime-editor/minor-mime-map))
-  (define-key mime-editor/minor-mime-map mime-prefix mime-editor/mime-map))
-
 (defun mime-editor/toggle-mode ()
   (interactive)
   (if mime/editor-mode-flag
@@ -566,15 +557,26 @@ Tspecials means any character that matches with it in header must be quoted.")
     (mime/editor-mode)
     ))
 
-(if running-xemacs
-    (add-minor-mode 'mime/editor-mode-flag
-                   '((" MIME-Edit "  mime-editor/transfer-level-string))
-                   mime-editor/minor-mime-map
-                   nil
-                   'mime-editor/toggle-mode)
-  (set-alist 'minor-mode-alist
-            'mime/editor-mode-flag
-            '((" MIME-Edit "  mime-editor/transfer-level-string))))
+(cond (running-xemacs
+       (defconst mime-editor/minor-mime-map nil "Keymap for MIME commands.")
+       (or mime-editor/minor-mime-map
+          (progn
+            (setq mime-editor/minor-mime-map 
+                  (make-sparse-keymap 'mime-editor/minor-mime-map))
+            (define-key
+              mime-editor/minor-mime-map mime-prefix mime-editor/mime-map)
+            ))
+       (add-minor-mode 'mime/editor-mode-flag
+                      '((" MIME-Edit "  mime-editor/transfer-level-string))
+                      mime-editor/minor-mime-map
+                      nil
+                      'mime-editor/toggle-mode)
+       )
+      (t
+       (set-alist 'minor-mode-alist
+                 'mime/editor-mode-flag
+                 '((" MIME-Edit "  mime-editor/transfer-level-string))))
+      )
 
 (defconst mime-editor/menu-title "MIME-Edit")