Function `mime-edit-define-keymap' was abolished.

diff --git a/mime-edit.el b/mime-edit.el
index ffe413e..5835705 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -7,7 +7,7 @@
 ;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/08/21 renamed from mime.el
 ;;     Renamed: 1997/2/21 from tm-edit.el
-;; Version: $Revision: 0.61 $
+;; Version: $Revision: 0.62 $
 ;; Keywords: MIME, multimedia, multilingual, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -122,7 +122,7 @@
 ;;;
 
 (defconst mime-edit-RCS-ID
-  "$Id: mime-edit.el,v 0.61 1997-03-05 17:34:50 morioka Exp $")
+  "$Id: mime-edit.el,v 0.62 1997-03-06 18:50:13 morioka Exp $")
 
 (defconst mime-edit-version (get-version-string mime-edit-RCS-ID))
 
@@ -537,9 +537,6 @@ Tspecials means any character that matches with it in header must be quoted.")
   (concat "1.0 (generated by " mime-edit-version-name ")")
   "MIME version number.")
 
-(defconst mime-edit-mime-map (make-sparse-keymap)
-  "Keymap for MIME commands.")
-
 
 ;;; @ keymap and menu
 ;;;
@@ -547,38 +544,39 @@ Tspecials means any character that matches with it in header must be quoted.")
 (defvar mime-edit-mode-flag nil)
 (make-variable-buffer-local 'mime-edit-mode-flag)
 
-(defun mime-edit-define-keymap (keymap)
-  "Add mime-editor commands to KEYMAP."
-  (if (not (keymapp keymap))
-      nil
-    (define-key keymap "\C-t" 'mime-edit-insert-text)
-    (define-key keymap "\C-i" 'mime-edit-insert-file)
-    (define-key keymap "\C-e" 'mime-edit-insert-external)
-    (define-key keymap "\C-v" 'mime-edit-insert-voice)
-    (define-key keymap "\C-y" 'mime-edit-insert-message)
-    (define-key keymap "\C-m" 'mime-edit-insert-mail)
-    (define-key keymap "\C-w" 'mime-edit-insert-signature)
-    (define-key keymap "\C-s" 'mime-edit-insert-signature)
-    (define-key keymap "\C-k" 'mime-edit-insert-key)
-    (define-key keymap "t"    'mime-edit-insert-tag)
-    (define-key keymap "a"    'mime-edit-enclose-alternative-region)
-    (define-key keymap "p"    'mime-edit-enclose-parallel-region)
-    (define-key keymap "m"    'mime-edit-enclose-mixed-region)
-    (define-key keymap "d"    'mime-edit-enclose-digest-region)
-    (define-key keymap "s"    'mime-edit-enclose-signed-region)
-    (define-key keymap "e"    'mime-edit-enclose-encrypted-region)
-    (define-key keymap "q"    'mime-edit-enclose-quote-region)
-    (define-key keymap "7"    'mime-edit-set-transfer-level-7bit)
-    (define-key keymap "8"    'mime-edit-set-transfer-level-8bit)
-    (define-key keymap "/"    'mime-edit-set-split)
-    (define-key keymap "v"    'mime-edit-set-sign)
-    (define-key keymap "h"    'mime-edit-set-encrypt)
-    (define-key keymap "\C-p" 'mime-edit-preview-message)
-    (define-key keymap "\C-z" 'mime-edit-exit)
-    (define-key keymap "?"    'mime-edit-help)
-    ))
+(defconst mime-edit-mime-map (make-sparse-keymap)
+  "Keymap for MIME commands.")
 
-(mime-edit-define-keymap mime-edit-mime-map)
+(or (keymapp mime-edit-mime-map)
+    (progn
+      (define-key mime-edit-mime-map "\C-t" 'mime-edit-insert-text)
+      (define-key mime-edit-mime-map "\C-i" 'mime-edit-insert-file)
+      (define-key mime-edit-mime-map "\C-e" 'mime-edit-insert-external)
+      (define-key mime-edit-mime-map "\C-v" 'mime-edit-insert-voice)
+      (define-key mime-edit-mime-map "\C-y" 'mime-edit-insert-message)
+      (define-key mime-edit-mime-map "\C-m" 'mime-edit-insert-mail)
+      (define-key mime-edit-mime-map "\C-w" 'mime-edit-insert-signature)
+      (define-key mime-edit-mime-map "\C-s" 'mime-edit-insert-signature)
+      (define-key mime-edit-mime-map "\C-k" 'mime-edit-insert-key)
+      (define-key mime-edit-mime-map "t"    'mime-edit-insert-tag)
+      (define-key mime-edit-mime-map
+       "a" 'mime-edit-enclose-alternative-region)
+      (define-key mime-edit-mime-map "p"    'mime-edit-enclose-parallel-region)
+      (define-key mime-edit-mime-map "m"    'mime-edit-enclose-mixed-region)
+      (define-key mime-edit-mime-map "d"    'mime-edit-enclose-digest-region)
+      (define-key mime-edit-mime-map "s"    'mime-edit-enclose-signed-region)
+      (define-key mime-edit-mime-map
+       "e" 'mime-edit-enclose-encrypted-region)
+      (define-key mime-edit-mime-map "q"    'mime-edit-enclose-quote-region)
+      (define-key mime-edit-mime-map "7"    'mime-edit-set-transfer-level-7bit)
+      (define-key mime-edit-mime-map "8"    'mime-edit-set-transfer-level-8bit)
+      (define-key mime-edit-mime-map "/"    'mime-edit-set-split)
+      (define-key mime-edit-mime-map "v"    'mime-edit-set-sign)
+      (define-key mime-edit-mime-map "h"    'mime-edit-set-encrypt)
+      (define-key mime-edit-mime-map "\C-p" 'mime-edit-preview-message)
+      (define-key mime-edit-mime-map "\C-z" 'mime-edit-exit)
+      (define-key mime-edit-mime-map "?"    'mime-edit-help)
+      ))
 
 (defun mime-edit-toggle-mode ()
   (interactive)