From: hmurata <hmurata>
Date: Fri, 24 Jun 2005 14:39:01 +0000 (+0000)
Subject: (wl-summary-rescan-message): Call
X-Git-Tag: wl-2_15_3~66
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=395e804f2a44792444dbf61af578e28edd1e5438;p=elisp%2Fwanderlust.git

(wl-summary-rescan-message): Call
`wl-thread-cleanup-symbols' before insert thread.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 854c452..c648e92 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-24  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-summary.el (wl-summary-rescan-message): Call
+	`wl-thread-cleanup-symbols' before insert thread.
+
 2005-06-12  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl.el (wl-init): Set `elmo-get-folder-function' as
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 9878554..cd62005 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1146,7 +1146,6 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	     (inhibit-read-only t))
 	(if (eq wl-summary-buffer-view 'thread)
 	    (let* ((thread-entity (wl-thread-get-entity number))
-		   (descendant (wl-thread-entity-get-descendant thread-entity))
 		   (thread-parent (wl-thread-entity-get-parent thread-entity))
 		   (entity-parent (elmo-message-entity-number
 				   (elmo-message-entity-parent folder entity)))
@@ -1156,18 +1155,22 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 		  (progn
 		    (wl-thread-entity-set-linked thread-entity nil)
 		    (wl-thread-update-line-on-buffer-sub nil number))
-		(wl-thread-delete-message number 'deep 'update)
-		(dolist (number (cons number descendant))
-		  (setq update-top-list
-			(nconc
-			 update-top-list
-			 (wl-summary-insert-thread
-			  (elmo-message-entity folder number)
-			  folder
-			  'update))))
-		(when update-top-list
-		  (wl-thread-update-indent-string-thread
-		   (elmo-uniq-list update-top-list)))))
+		(let ((replacements
+		       (cons number
+			     (wl-thread-entity-get-descendant thread-entity))))
+		  (wl-thread-delete-message number 'deep 'update)
+		  (wl-thread-cleanup-symbols replacements)
+		  (dolist (number replacements)
+		    (setq update-top-list
+			  (nconc
+			   update-top-list
+			   (wl-summary-insert-thread
+			    (elmo-message-entity folder number)
+			    folder
+			    'update))))
+		  (when update-top-list
+		    (wl-thread-update-indent-string-thread
+		     (elmo-uniq-list update-top-list))))))
 	    (delete-region (point-at-bol) (1+ (point-at-eol)))
 	    (wl-summary-insert-line
 	     (wl-summary-create-line entity nil