Use `eval-after-load' instead of `call-after-loaded'.

Move setting for emh-comp.el to emh-setup.el.

diff --git a/emh.el b/emh.el
index f4a5075..c6187a8 100644 (file)
--- a/emh.el
+++ b/emh.el
@@ -8,7 +8,7 @@
 ;; Created: 1993/11/21
 ;;     Renamed: 1993/11/27 from mh-e-mime.el
 ;;     Renamed: 1997/02/21 from tm-mh-e.el
-;; Version: $Revision: 0.20 $
+;; Version: $Revision: 0.21 $
 ;; Keywords: MH, MIME, multimedia, encoded-word, multilingual, mail
 
 ;; This file is part of emh.
@@ -38,7 +38,7 @@
 ;;;
 
 (defconst emh-RCS-ID
-  "$Id: emh.el,v 0.20 1997-05-12 12:32:35 morioka Exp $")
+  "$Id: emh.el,v 0.21 1997-08-05 09:10:22 morioka Exp $")
 
 (defconst emh-version (get-version-string emh-RCS-ID))
 
@@ -296,32 +296,32 @@ It is registered to variable `mime-view-content-header-filter-alist'."
 ;;; @@ for mime-partial
 ;;;
 
-(call-after-loaded
- 'mime-view
- (function
-  (lambda ()
-    (autoload 'mime-combine-message/partials-automatically
-      "mime-partial"
-      "Internal method to combine message/partial messages automatically.")
-    (set-atype 'mime-acting-condition
-              '((type . "message/partial")
-                (method . mime-combine-message/partials-automatically)
-                (major-mode . mh-show-mode)
-                (summary-buffer-exp
-                 . (and (or (string-match "^article-\\(.+\\)$" article-buffer)
-                            (string-match "^show-\\(.+\\)$" article-buffer))
-                        (substring article-buffer
-                                   (match-beginning 1) (match-end 1))
-                        ))
-                ))
-    (set-alist 'mime-view-partial-message-method-alist
-              'mh-show-mode
-              (function
-               (lambda ()
-                 (let ((emh-automatic-mime-preview t))
-                   (emh-show)
-                   ))))
-    )))
+(eval-after-load
+    "mime-view"
+  '(progn
+     (autoload 'mime-combine-message/partials-automatically
+       "mime-partial"
+       "Internal method to combine message/partial messages automatically.")
+     (set-atype 'mime-acting-condition
+               '((type . "message/partial")
+                 (method . mime-combine-message/partials-automatically)
+                 (major-mode . mh-show-mode)
+                 (summary-buffer-exp
+                  . (and (or (string-match "^article-\\(.+\\)$"
+                                           article-buffer)
+                             (string-match "^show-\\(.+\\)$" article-buffer))
+                         (substring article-buffer
+                                    (match-beginning 1) (match-end 1))
+                         ))
+                 ))
+     (set-alist 'mime-view-partial-message-method-alist
+               'mh-show-mode
+               (function
+                (lambda ()
+                  (let ((emh-automatic-mime-preview t))
+                    (emh-show)
+                    ))))
+     ))
 
 
 ;;; @ set up
@@ -354,47 +354,10 @@ It is registered to variable `mime-view-content-header-filter-alist'."
 (add-hook 'mh-before-quit-hook (function emh-summary-before-quit))
 
 
-;;; @@ 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)
-
-(call-after-loaded
- 'mime-setup
- (function
-  (lambda ()
-    (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)
-
-    (call-after-loaded
-     'mh-comp
-     (function
-      (lambda ()
-       (require 'emh-comp)
-       ))
-     'mh-letter-mode-hook)
-    )))
-
-
 ;;; @ for BBDB
 ;;;
 
-(call-after-loaded
- 'bbdb
- (function
-  (lambda ()
-    (require 'mime-bbdb)
-    )))
+(eval-after-load "bbdb" '(require 'mime-bbdb))
 
 
 ;;; @ end