X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emh.el;h=c6187a89695c849d658570fe8eaf1941de1a5929;hb=f61819833392aabdd29cb2b2e17645d27df86162;hp=12000a5924d0ac5fb4b5b559e62955102ece66a2;hpb=d7e4a4d5b9d4ed5614cdb33882dba955525938c9;p=elisp%2Femh.git

diff --git a/emh.el b/emh.el
index 12000a5..c6187a8 100644
--- 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.15 $
+;; 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.15 1997-03-18 13:47:26 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))
 
@@ -177,9 +177,9 @@ With arg, turn MIME processing on if arg is positive."
   (save-excursion
     (set-buffer mh-show-buffer)
     (if (null emh-automatic-mime-preview)
-	(if (and mime::preview/article-buffer
-		 (get-buffer mime::preview/article-buffer))
-	    (kill-buffer mime::preview/article-buffer)
+	(if (and mime-raw-buffer
+		 (get-buffer mime-raw-buffer))
+	    (kill-buffer mime-raw-buffer)
 	  )))
   (mh-invalidate-show-buffer)
   (mh-show (mh-get-msg-num t))
@@ -255,13 +255,8 @@ It is registered to variable `mime-view-content-header-filter-alist'."
 	   (function emh-content-header-filter))
 
 (defun emh-quitting-method ()
-  (let ((win (get-buffer-window
-	      mime/output-buffer-name))
-	(buf (current-buffer))
-	)
-    (if win
-	(delete-window win)
-      )
+  (let ((buf (current-buffer)))
+    (mime-hide-echo-buffer)
     (pop-to-buffer
      (let ((name (buffer-name buf)))
        (substring name 5)
@@ -301,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/content-decoding-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
@@ -345,8 +340,8 @@ It is registered to variable `mime-view-content-header-filter-alist'."
     (if buf
 	(let ((the-buf (current-buffer)))
 	  (switch-to-buffer buf)
-	  (if (and mime::article/preview-buffer
-		   (setq buf (get-buffer mime::article/preview-buffer))
+	  (if (and mime-view-buffer
+		   (setq buf (get-buffer mime-view-buffer))
 		   )
 	      (progn
 		(switch-to-buffer the-buf)
@@ -357,49 +352,12 @@ 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