From: yoichi <yoichi>
Date: Tue, 11 Feb 2003 10:46:21 +0000 (+0000)
Subject: * wl-summary.el (wl-summary-virtual): Call wl-summary-virtual-hook.
X-Git-Tag: wl-2_11_3~6
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13eb24a1de4bdfcf06233c6c6d78f901556f90f9;p=elisp%2Fwanderlust.git

* wl-summary.el (wl-summary-virtual): Call wl-summary-virtual-hook.

* wl-summary.el (wl-summary-jump-to-msg-by-message-id): Force
searching via nntp if wl-summary-search-via-nntp is 'force.
Otherwise, invoke searching in nntp folder only.
* wl-vars.el (wl-summary-search-via-nntp): Change accordingly.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 30c002e..9d8086b 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,12 @@
 2003-02-11  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
+	* wl-summary.el (wl-summary-virtual): Call wl-summary-virtual-hook.
+
+	* wl-summary.el (wl-summary-jump-to-msg-by-message-id): Force
+	searching via nntp if wl-summary-search-via-nntp is 'force.
+	Otherwise, invoke searching in nntp folder only.
+	* wl-vars.el (wl-summary-search-via-nntp): Change accordingly.
+
 	* wl-draft.el (wl-draft-remove-text-plain-tag): Specify subtype
 	explicitly for mime-make-text-tag.
 
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index dc31d50..2eaa74a 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -3675,7 +3675,8 @@ If ARG, exit virtual folder."
 					  wl-summary-pick-field-default)
 					 "/"
 					 (wl-summary-buffer-folder-name))
-				 'update nil nil t)))
+				 'update nil nil t)
+    (run-hooks 'wl-summary-virtual-hook)))
 
 (defun wl-summary-delete-all-temp-marks (&optional no-msg)
   "Erase all temp marks from buffer."
@@ -4741,7 +4742,11 @@ Return t if message exists."
 		     (t
 		      (message errmsg)
 		      nil)))
-	      (wl-summary-search-via-nntp
+	      ((or (eq wl-summary-search-via-nntp 'force)
+		   (and
+		    (eq (elmo-folder-type-internal wl-summary-buffer-elmo-folder)
+			'nntp)
+		    wl-summary-search-via-nntp)
 	       (wl-summary-jump-to-msg-by-message-id-via-nntp msgid))
 	      (t
 	       (message errmsg)
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 1fde6e2..00d1b6c 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -2111,9 +2111,11 @@ or 'skip-no-unread."
 
 (defcustom wl-summary-search-via-nntp 'confirm
   "*Non-nil, search message via nntp after `wl-summary-jump-to-msg-by-message-id'.
-If the value is 'confirm, confirm before search."
-  :type '(choice (const confirm)
-		 (const :tag "always" t)
+If the value is 'confirm, confirm before search, 'force to search via nntp
+regardless of current folder type."
+  :type '(choice (const :tag "confirm" confirm)
+		 (const :tag "always" force)
+		 (const :tag "in nntp folder" t)
 		 (const :tag "never" nil))
   :group 'wl-summary)