From: hmurata <hmurata>
Date: Thu, 4 Dec 2003 01:23:44 +0000 (+0000)
Subject: * wl-mime.el (wl-mime-combine-message/partial-pieces): Fixed bug;
X-Git-Tag: wl-2_11_23~27
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a14d3319b474a9d7b3048178f5a9fae5deb1122;p=elisp%2Fwanderlust.git

* wl-mime.el (wl-mime-combine-message/partial-pieces): Fixed bug;
Removed duplicate local bind `folder'.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 754dd60..7ee346f 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-04  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-mime.el (wl-mime-combine-message/partial-pieces): Fixed bug;
+	Removed duplicate local bind `folder'.
+
 2003-11-30  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-spam.el (wl-spam-folder): Renamed from `wl-spam-folder-name'.
diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 6329a5e..de91fd0 100644
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -557,11 +557,9 @@ With ARG, ask destination folder."
 (defun wl-mime-combine-message/partial-pieces (entity situation)
   "Internal method for wl to combine message/partial messages automatically."
   (interactive)
-  (let* ((folder (save-excursion
-		   (set-buffer wl-message-buffer-cur-summary-buffer)
+  (let* ((folder (with-current-buffer wl-message-buffer-cur-summary-buffer
 		   wl-summary-buffer-elmo-folder))
 	 (mime-display-header-hook 'wl-highlight-headers)
-	 (folder wl-message-buffer-cur-folder)
 	 (id (or (cdr (assoc "id" situation)) ""))
 	 (mother (current-buffer))
 	 (summary-buf wl-message-buffer-cur-summary-buffer)
@@ -600,7 +598,7 @@ With ARG, ask destination folder."
 	    (let* ((message
 		    ;; request message at the cursor in Subject buffer.
 		    (wl-message-request-partial
-		     folder
+		     (elmo-folder-name-internal folder)
 		     (elmo-message-entity-number entity)))
 		   (situation (mime-entity-situation message))
 		   (the-id (or (cdr (assoc "id" situation)) "")))