X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emh.el;h=ba23340571b32c0ee7cb8b412ec5eaacec7f954a;hb=9b025ea8ff4641908345ba5f3f550a66b2c07cee;hp=67227ddf3a3b6c1ebd8671dc148c70ea78259718;hpb=38d43db97c9c2d7575f3b1c143ea722df2ce8dec;p=elisp%2Femh.git

diff --git a/emh.el b/emh.el
index 67227dd..ba23340 100644
--- a/emh.el
+++ b/emh.el
@@ -39,7 +39,7 @@
 ;;;
 
 (defconst emh-RCS-ID
-  "$Id: emh.el,v 1.3 1998-03-13 13:05:12 morioka Exp $")
+  "$Id: emh.el,v 1.5 1998-03-13 16:19:40 morioka Exp $")
 
 (defconst emh-version (get-version-string emh-RCS-ID))
 
@@ -301,32 +301,30 @@ It is registered to variable `mime-view-content-header-filter-alist'."
 ;;; @@ for mime-partial
 ;;;
 
-(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)(type . 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)
-		     ))))
-     ))
+(autoload 'mime-method-to-combine-message/partial-pieces
+  "mime-partial"
+  "Internal method to combine message/partial messages automatically.")
+
+(set-atype 'mime-acting-condition
+	   '((type . message)(type . partial)
+	     (method . mime-method-to-combine-message/partial-pieces)
+	     (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 +343,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-view-buffer
-		   (setq buf (get-buffer mime-view-buffer))
+	  (if (and mime-preview-buffer
+		   (setq buf (get-buffer mime-preview-buffer))
 		   )
 	      (progn
 		(switch-to-buffer the-buf)