Synch to No Gnus 200411150531.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82050d9..acb4a68 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nntp.el (nntp-request-update-info): Return nil if
+       nntp-marks-is-evil is true so that gnus-get-unread-articles-in-group
+       may not call gnus-activate-group which uselessly issues the GROUP
+       commands for all nntp groups and wastes time.  Reported by Romain
+       Francoise <romain@orebokech.com>.
+
+       * gnus-start.el (gnus-get-unread-articles): Remove redundant test.
+
 2004-11-15  Simon Josefsson  <jas@extundo.com>
 
        * gnus-art.el (gnus-header-button-alist): Handle URLs in OpenPGP:
@@ -99,7 +109,7 @@
 
        * starttls.el (starttls-gnutls-program, starttls-use-gnutls)
        (starttls-extra-arguments, starttls-process-connection-type)
-       (starttls-connect, starttls-failure, starttls-success): 
+       (starttls-connect, starttls-failure, starttls-success):
 
        * spam-stat.el (spam-stat): Add :version.
 
@@ -111,7 +121,7 @@
        * nnmail.el (nnmail-split-fancy-with-parent-ignore-groups)
        (nnmail-cache-ignore-groups, nnmail-spool-hook)
        (nnmail-split-fancy-match-partial-words)
-       (nnmail-split-lowercase-expanded): 
+       (nnmail-split-lowercase-expanded):
 
        * nndiary.el (nndiary): Add :version.
 

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index d52044e..c7a3d7c 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1709,8 +1709,7 @@ If SCAN, request a scan of that group as well."
       (cond ((and method (eq method-type 'foreign))
             ;; These groups are foreign.  Check the level.
             (if (<= (gnus-info-level info) foreign-level)
-                (when (and (<= (gnus-info-level info) foreign-level)
-                           (setq active (gnus-activate-group group 'scan)))
+                (when (setq active (gnus-activate-group group 'scan))
                   ;; Let the Gnus agent save the active file.
                   (when (and gnus-agent active (gnus-online method))
                     (gnus-agent-save-group-info

diff --git a/lisp/nntp.el b/lisp/nntp.el
index f8bd011..1bb3953 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1118,29 +1118,29 @@ newsgroups that match the regexp."
 
 (deffoo nntp-request-update-info (group info &optional server)
   (unless nntp-marks-is-evil
-    (nntp-possibly-create-directory group server))
-  (when (and (not nntp-marks-is-evil) (nntp-marks-changed-p group server))
-    (nnheader-message 8 "Updating marks for %s..." group)
-    (nntp-open-marks group server)
-    ;; Update info using `nntp-marks'.
-    (mapc (lambda (pred)
-           (unless (memq (cdr pred) gnus-article-unpropagated-mark-lists)
-             (gnus-info-set-marks
-              info
-              (gnus-update-alist-soft
-               (cdr pred)
-               (cdr (assq (cdr pred) nntp-marks))
-               (gnus-info-marks info))
-              t)))
-         gnus-article-mark-lists)
-    (let ((seen (cdr (assq 'read nntp-marks))))
-      (gnus-info-set-read info
-                         (if (and (integerp (car seen))
-                                  (null (cdr seen)))
-                             (list (cons (car seen) (car seen)))
-                           seen)))
-    (nnheader-message 8 "Updating marks for %s...done" group))
-  info)
+    (nntp-possibly-create-directory group server)
+    (when (nntp-marks-changed-p group server)
+      (nnheader-message 8 "Updating marks for %s..." group)
+      (nntp-open-marks group server)
+      ;; Update info using `nntp-marks'.
+      (mapc (lambda (pred)
+             (unless (memq (cdr pred) gnus-article-unpropagated-mark-lists)
+               (gnus-info-set-marks
+                info
+                (gnus-update-alist-soft
+                 (cdr pred)
+                 (cdr (assq (cdr pred) nntp-marks))
+                 (gnus-info-marks info))
+                t)))
+           gnus-article-mark-lists)
+      (let ((seen (cdr (assq 'read nntp-marks))))
+       (gnus-info-set-read info
+                           (if (and (integerp (car seen))
+                                    (null (cdr seen)))
+                               (list (cons (car seen) (car seen)))
+                             seen)))
+      (nnheader-message 8 "Updating marks for %s...done" group))
+    info))