Merge remi-1_14_2-1.

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

diff --git a/mime-partial.el b/mime-partial.el
index 14b3ff9..618c5a6 100644 (file)
--- a/mime-partial.el
+++ b/mime-partial.el
@@ -35,6 +35,7 @@ automatically."
   (let* ((id (cdr (assoc "id" situation)))
         (target (cdr (assq 'major-mode situation)))
         (subject-buf (eval (cdr (assq 'summary-buffer-exp situation))))
+        (mother (current-buffer))
         subject-id
         (root-dir (expand-file-name
                    (concat "m-prts-" (user-login-name))
@@ -54,7 +55,7 @@ automatically."
            (not (y-or-n-p "Merge partials?"))
            )
        (mime-store-message/partial-piece entity situation)
-      (setq subject-id (mime-read-field 'Subject entity))
+      (setq subject-id (mime-entity-read-field entity 'Subject))
       (if (string-match "[0-9\n]+" subject-id)
          (setq subject-id (substring subject-id 0 (match-beginning 0)))
        )
@@ -71,8 +72,7 @@ automatically."
                   (situation (mime-entity-situation message))
                   (the-id (cdr (assoc "id" situation))))
              (when (string= the-id id)
-               (save-excursion
-                 (set-buffer (mime-entity-buffer message))
+               (with-current-buffer mother
                  (mime-store-message/partial-piece message situation)
                  )
                (if (file-exists-p full-file)