From: murata <murata>
Date: Sun, 22 Apr 2001 12:15:00 +0000 (+0000)
Subject: * wl-expire.el (wl-summary-expire): Fixed problem that do not expire
X-Git-Tag: wl-2_6-root^3~36
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b9f0e40a8381ba33e7bff893f2ee8c104f256949;p=elisp%2Fwanderlust.git

* wl-expire.el (wl-summary-expire): Fixed problem that do not expire
  called in folder mode.
* wl-var.el (wl-summary-exit-pre-hook): New variable.
* wl-summary.el (wl-summary-exit-pre-hook): Run `wl-summary-exit-pre-hook'
  before exit summary mode.
---

diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index 95e7f3e..f81203a 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -537,7 +537,9 @@ Refile to archive folder followed message date."
 	       (or (not (interactive-p))
 		   (y-or-n-p (format "Expire %s? " (elmo-folder-name-internal
 						    folder)))))
-      (let* ((msgdb (wl-summary-buffer-msgdb))
+      (let* ((msgdb (or (wl-summary-buffer-msgdb)
+			(progn (elmo-folder-open folder 'load-msgdb)
+			       (elmo-folder-msgdb folder))))
 	     (number-alist (elmo-msgdb-get-number-alist msgdb))
 	     (mark-alist (elmo-msgdb-get-mark-alist msgdb))
 	     expval rm-type val-type value more args
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index e1db38f..92b5683 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -1010,6 +1010,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	summary-win
 	message-buf message-win
 	folder-buf folder-win)
+    (run-hooks 'wl-summary-exit-pre-hook)
     (if wl-summary-buffer-exit-function
 	(funcall wl-summary-buffer-exit-function)
       (wl-summary-cleanup-temp-marks sticky)
@@ -2473,6 +2474,7 @@ If ARG, without confirm."
 		     (elmo-folder-name-internal folder))) ; folder is moved.
 	       (eq major-mode 'wl-summary-mode)) ; called in summary.
       (setq wl-summary-last-visited-folder (wl-summary-buffer-folder-name))
+      (run-hooks 'wl-summary-exit-pre-hook)
       (wl-summary-cleanup-temp-marks (wl-summary-sticky-p))
       (wl-summary-save-view 'keep) ; keep current buffer, anyway.
       (elmo-folder-commit wl-summary-buffer-elmo-folder))
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 700bc86..43736ea 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -457,6 +457,8 @@ reasons of system internal to accord facilities for the Emacs variants.")
   "A hook called when Message is displayed.")
 (defvar wl-message-exit-hook nil
   "A hook called when quit message.")
+(defvar wl-summary-exit-pre-hook nil
+  "A hook called before exit summary mode.")
 (defvar wl-summary-exit-hook nil
   "A hook called when exit summary mode.")
 (defvar wl-highlight-headers-hook nil