Use `eval-after-load' instead of `call-after-loaded'; Abolish function

`emh-setup'.

Move setting for emh-comp.el from emh.el.

diff --git a/emh-setup.el b/emh-setup.el
index 8f25f46..b3693e1 100644 (file)
--- a/emh-setup.el
+++ b/emh-setup.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emh-setup.el,v 0.0 1997-03-14 08:48:46 morioka Exp $
+;; Version: $Id: emh-setup.el,v 0.1 1997-08-05 09:14:20 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -31,14 +31,7 @@
 ;;; @ for emh
 ;;;
 
-(defun emh-setup ()
-  (require 'emh)
-  )
-
-(call-after-loaded 'mh-e 'emh-setup 'mh-folder-mode-hook)
-(or (featurep 'mh-e)
-    (add-hook 'mh-letter-mode-hook 'emh-setup)
-    )
+(eval-after-load "mh-e" '(require 'emh))
 
 
 ;;; @ for mime-edit
@@ -65,6 +58,27 @@
 (add-hook 'mh-before-send-letter-hook 'mime-edit-maybe-translate)
 
 
+;;; @@ for emh-comp.el
+;;;
+
+(autoload 'emh-edit-again "emh-comp"
+  "Clean-up a draft or a message previously sent and make it resendable." t)
+(autoload 'emh-extract-rejected-mail "emh-comp"
+  "Extract a letter returned by the mail system and make it re-editable." t)
+(autoload 'emh-forward "emh-comp"
+  "Forward a message or message sequence by MIME style." t)
+
+(substitute-key-definition
+ 'mh-edit-again 'emh-edit-again mh-folder-mode-map)
+(substitute-key-definition
+ 'mh-extract-rejected-mail 'emh-extract-rejected-mail
+ mh-folder-mode-map)
+(substitute-key-definition
+ 'mh-forward 'emh-forward mh-folder-mode-map)
+
+(eval-after-load "mh-comp" '(require 'emh-comp))
+
+
 ;;; @ end
 ;;;