From: keiichi <keiichi>
Date: Tue, 22 Feb 2000 04:57:14 +0000 (+0000)
Subject: (nnvirtual-request-article): Bind gnus-override-method to nil.
X-Git-Tag: nana-gnus-7_1_0_16~36
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6ae955869a1a5289c70099979fa66b64f9aa19;p=elisp%2Fgnus.git-

(nnvirtual-request-article): Bind gnus-override-method to nil.
(nnvirtual-request-update-mark): Don't update mark when article is not there.
---

diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el
index 810dbe5..11eb1b6 100644
--- a/lisp/nnvirtual.el
+++ b/lisp/nnvirtual.el
@@ -197,8 +197,9 @@ component group will show up when you enter the virtual group.")
 	  (save-excursion
 	    (when buffer
 	      (set-buffer buffer))
-	    (let ((method (gnus-find-method-for-group
-			   nnvirtual-last-accessed-component-group)))
+	    (let* ((gnus-override-method nil)
+		   (method (gnus-find-method-for-group
+			    nnvirtual-last-accessed-component-group)))
 	      (funcall (gnus-get-function method 'request-article)
 		       article nil (nth 1 method) buffer)))))
       ;; This is a fetch by number.
@@ -283,12 +284,11 @@ component group will show up when you enter the virtual group.")
 
 (deffoo nnvirtual-request-update-mark (group article mark)
   (let* ((nart (nnvirtual-map-article article))
-	 (cgroup (car nart))
-	 ;; The component group might be a virtual group.
-	 (nmark (gnus-request-update-mark cgroup (cdr nart) mark)))
+	 (cgroup (car nart)))
     (when (and nart
 	       (memq mark gnus-auto-expirable-marks)
-	       (= mark nmark)
+	       ;; The component group might be a virtual group.
+	       (= mark (gnus-request-update-mark cgroup (cdr nart) mark))
 	       (gnus-group-auto-expirable-p cgroup))
       (setq mark gnus-expirable-mark)))
   mark)