Sync up with remi-1_6_0.

[elisp/semi.git] / mime-partial.el

diff --git a/mime-partial.el b/mime-partial.el
index 522211a..c8ef3ed 100644 (file)
--- a/mime-partial.el
+++ b/mime-partial.el
@@ -1,14 +1,12 @@
 ;;; mime-partial.el --- Grabbing all MIME "message/partial"s.
 
-;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: OKABE Yasuo @ Kyoto University
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version:
-;;     $Id: mime-partial.el,v 0.7 1997-03-18 12:59:09 morioka Exp $ 
 ;; Keywords: message/partial, MIME, multimedia, mail, news
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Suite of Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -42,7 +40,7 @@
        (error "Fatal. Unsupported mode")
        ))))
 
-(defun mime-combine-message/partials-automatically (beg end cal)
+(defun mime-method-to-combine-message/partial-pieces (entity cal)
   "Internal method for mime-view to combine message/partial messages
 automatically.  This function refers variable
 `mime-view-partial-message-method-alist' to select function to display
@@ -67,8 +65,8 @@ partial messages using mime-view."
     (if (or (file-exists-p full-file)
            (not (y-or-n-p "Merge partials?"))
            )
-       (mime-article/decode-message/partial beg end cal)
-      (let (cinfo the-id parameters)
+       (mime-method-to-store-message/partial entity cal)
+      (let (the-id parameters)
        (setq subject-id (std11-field-body "Subject"))
        (if (string-match "[0-9\n]+" subject-id)
            (setq subject-id (substring subject-id 0 (match-beginning 0)))
@@ -80,17 +78,13 @@ partial messages using mime-view."
            (while t
              (mime-view-partial-message target)
              (set-buffer article-buffer)
-             (set-buffer mime::article/preview-buffer)
-             (setq cinfo
-                   (mime::preview-content-info/content-info
-                    (car mime::preview/content-list)))
-             (setq parameters (mime::content-info/parameters cinfo))
+             (setq parameters
+                   (mime-entity-parameters mime-raw-message-info))
              (setq the-id (cdr (assoc "id" parameters)))
-             (if (equal the-id id)
+             (if (string= the-id id)
                  (progn
-                   (set-buffer article-buffer)
-                   (mime-article/decode-message/partial
-                    (point-min)(point-max) parameters)
+                   (mime-method-to-store-message/partial
+                    mime-raw-message-info parameters)
                    (if (file-exists-p full-file)
                        (throw 'tag nil)
                      )