From: hmurata <hmurata>
Date: Mon, 24 Jul 2006 13:16:53 +0000 (+0000)
Subject: (wl-folder-expire-entity): Rewite without
X-Git-Tag: wl-2_15_4~20
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5878d0e739c988790bc7b9aefe94cc7a57477b51;p=elisp%2Fwanderlust.git

(wl-folder-expire-entity): Rewite without
`wl-summary-goto-folder-subr'.
(wl-folder-expire-current-entity): Don't kill summary buffer.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 9d264b7..4f603d7 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,10 +1,16 @@
+2006-07-24  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-expire.el (wl-folder-expire-entity): Rewite without
+	`wl-summary-goto-folder-subr'.
+	(wl-folder-expire-current-entity): Don't kill summary buffer.
+
 2006-07-21  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-folder.el (wl-folder-sync-entity): Rewrite without
 	`wl-summary-goto-folder-subr'.
 	(wl-folder-mark-as-read-all-entity): Likewise.
 
-	* wl-summary.el (wl-summary-sync): Accept symbol for `range.
+	* wl-summary.el (wl-summary-sync): Accept symbol for `range'.
 
 2006-06-22  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index e9f7add..8fcd00d 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -698,30 +698,27 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
 	(setq flist (cdr flist)))))
    ((stringp entity)
     (when (wl-expire-folder-p entity)
-      (let* ((folder (wl-folder-get-elmo-folder entity))
-	     (update-msgdb (cond
+      (let ((folder (wl-folder-get-elmo-folder entity))
+	    (summary (wl-summary-get-buffer entity))
+	    (update-msgdb (cond
 			   ((consp wl-expire-folder-update-msgdb)
 			    (wl-string-match-member
 			     entity
 			     wl-expire-folder-update-msgdb))
 			   (t
-			    wl-expire-folder-update-msgdb)))
-	    (wl-summary-highlight (if (or (wl-summary-sticky-p folder)
-					  (wl-summary-always-sticky-folder-p
-					   folder))
-				      wl-summary-highlight))
-	    wl-auto-select-first ret-val)
-	(save-window-excursion
-	  (save-excursion
-	    (and update-msgdb
-		 (wl-summary-goto-folder-subr entity 'force-update nil))
-	    (setq ret-val (wl-summary-expire folder (not update-msgdb)))
-	    (if update-msgdb
-		(progn
-		  (wl-summary-save-view)
-		  (elmo-folder-commit wl-summary-buffer-elmo-folder))
-	      (if ret-val
-		  (wl-folder-check-entity entity))))))))))
+			    wl-expire-folder-update-msgdb))))
+	(when update-msgdb
+	  (wl-folder-sync-entity entity))
+	(if summary
+	    (save-selected-window
+	      (with-current-buffer summary
+		(let ((win (get-buffer-window summary t)))
+		  (when win
+		    (select-window win)))
+		(when (wl-summary-expire folder)
+		  (wl-summary-save-status))))
+	  (when (wl-summary-expire folder 'no-summary)
+	    (wl-folder-check-entity entity))))))))
 
 ;; Command
 
@@ -738,8 +735,6 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
        (wl-folder-search-entity-by-name entity-name
 					wl-folder-entity
 					type))
-      (if (get-buffer wl-summary-buffer-name)
-	  (kill-buffer wl-summary-buffer-name))
       (message "Expiring %s is done" entity-name))))
 
 ;;; Archive