From: yamaoka <yamaoka>
Date: Thu, 19 Dec 2002 22:36:13 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_10-00-quimby~25
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=676da95714763778a2cbbd1b97479ccf70f635f5;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bde52f9..4b20657 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-19  Paul Jarc  <prj@po.cwru.edu>
+
+	* gnus-int.el (gnus-request-update-info): nnchoke-r-u-i might not
+	return the info object.
+
 2002-12-18  Paul Jarc  <prj@po.cwru.edu>
 
 	* gnus-int.el (gnus-request-update-info): Artificially add
diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index adb794a..74d68d0 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -484,20 +484,22 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
     (setq gnus-command-method (gnus-server-to-method gnus-command-method)))
   (when (gnus-check-backend-function
 	 'request-update-info (car gnus-command-method))
-    (let* ((group (gnus-info-group info))
-           (result (funcall (gnus-get-function gnus-command-method
-                                               'request-update-info)
-                            (gnus-group-real-name group)
-                            info (nth 1 gnus-command-method))))
-      (when result ;; artificially add nonexistent articles to the read range
-        (let* ((active (gnus-active group))
-               (min (car active)))
-          (when (> min 1) ;; otherwise, there are no known nonexistent articles
-            (let* ((range (if (= min 2) 1 (cons 1 (1- min))))
-                   (read (gnus-info-read result))
-                   (new-read (gnus-range-add read (list range))))
-              (gnus-info-set-read result new-read)))))
-      result)))
+    (let ((group (gnus-info-group info)))
+      (and (funcall (gnus-get-function gnus-command-method
+				       'request-update-info)
+		    (gnus-group-real-name group)
+		    info (nth 1 gnus-command-method))
+	   ;; If the minimum article number is greater than 1, then all
+	   ;; smaller article numbers are known not to exist; we'll
+	   ;; artificially add those to the 'read range.
+	   (let* ((active (gnus-active group))
+		  (min (car active)))
+	     (when (> min 1)
+	       (let* ((range (if (= min 2) 1 (cons 1 (1- min))))
+		      (read (gnus-info-read info))
+		      (new-read (gnus-range-add read (list range))))
+		 (gnus-info-set-read info new-read)))
+	     info)))))
 
 (defun gnus-request-expire-articles (articles group &optional force)
   (let* ((gnus-command-method (gnus-find-method-for-group group))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index bf73055..6fe1519 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-19  Paul Jarc  <prj@po.cwru.edu>
+
+	* gnus.texi (Optional Back End Functions):
+	nnchoke-request-update-info need not return the info object.
+
 2002-12-15  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnusref.tex: Additions.
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index a896df5..bfeebbb 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -23893,8 +23893,8 @@ group-buffer = *active-line / *group-status
 Gnus グループ情報 (@pxref{Group Info}) が変更箇所としてバックエ
 ンドに渡されます。これはバックエンドが (仮想グループや imap グルー
 プの場合のように) 本当に全ての情報を持っている場合に便利になりま
-す。この関数は、その要求に適合させる情報を破壊的に置き換え、そ
-の (置き換えられた) グループ情報を返します。
+す。この関数は、その要求に適合させる情報を破壊的に置き換え、
+@code{nil} ではない値を返さなければなりません。
 
 この関数から返される結果のデータはありません。
 
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 1b2d51e..c6b1f93 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -24398,7 +24398,7 @@ A Gnus group info (@pxref{Group Info}) is handed to the back end for
 alterations.  This comes in handy if the back end really carries all the
 information (as is the case with virtual and imap groups).  This
 function should destructively alter the info to suit its needs, and
-should return the (altered) group info.
+should return a non-nil value.
 
 There should be no result data from this function.