Synch to Gnus 200312300519.

[elisp/gnus.git-] / lisp / gnus.el

diff --git a/lisp/gnus.el b/lisp/gnus.el
index fc0069d..3446048 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -3360,14 +3360,12 @@ that that variable is buffer-local to the summary buffers."
               (let (match)
                 (mapcar 
                  (lambda (info)
-                   (let* ((info-method (gnus-info-method info))
-                          (info-server 
-                           (if (stringp info-method)
-                               info-method
-                             (gnus-method-to-server info-method))))
-                     (setq match (or (equal server info-server)
-                                     match))))
-                        (cdr gnus-newsrc-alist))
+                   (let ((info-method (gnus-info-method info)))
+                     (unless (stringp info-method)
+                       (let ((info-server (gnus-method-to-server info-method)))
+                         (when (equal server info-server)
+                           (setq match info-method))))))
+                 (cdr gnus-newsrc-alist))
                 match))))
         (when result
           (push (cons server result) gnus-server-method-cache))
@@ -3580,10 +3578,10 @@ You should probably use `gnus-find-method-for-group' instead."
 (defsubst gnus-secondary-method-p (method)
   "Return whether METHOD is a secondary select method."
   (let ((methods gnus-secondary-select-methods)
-       (gmethod (gnus-server-get-method nil method)))
+       (gmethod (inline (gnus-server-get-method nil method))))
     (while (and methods
                (not (gnus-method-equal
-                     (gnus-server-get-method nil (car methods))
+                     (inline (gnus-server-get-method nil (car methods)))
                      gmethod)))
       (setq methods (cdr methods)))
     methods))