* gnus-msg.el (gnus-inews-group-method): Use and return the

method, not the server.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0003c96..4715ec9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-19 16:14:41  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-msg.el (gnus-inews-group-method): Use and return the
+       method, not the server.
+
 2001-08-19  Simon Josefsson  <jas@extundo.com>
 
        * gnus-srvr.el (gnus-server-agent-face): New.

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 1572a28..3876f6d 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1189,19 +1189,18 @@ this is a reply."
 ;;; Gcc handling.
 
 (defun gnus-inews-group-method (group)
-  (cond ((and (null (gnus-get-info group))
-             (eq (car gnus-message-archive-method)
-                 (car
-                  (gnus-server-to-method
-                   (gnus-group-method group)))))
-        ;; If the group doesn't exist, we assume
-        ;; it's an archive group...
-        gnus-message-archive-method)
-       ;; Use the method.
-       ((gnus-info-method (gnus-get-info group))
-        (gnus-info-method (gnus-get-info group)))
-       ;; Find the method.
-       (t (gnus-group-method group))))
+  (cond
+   ;; If the group doesn't exist, we assume
+   ;; it's an archive group...
+   ((and (null (gnus-get-info group))
+        (eq (car (gnus-server-to-method gnus-message-archive-method))
+            (car (gnus-server-to-method (gnus-group-method group)))))
+    gnus-message-archive-method)
+   ;; Use the method.
+   ((gnus-info-method (gnus-get-info group))
+    (gnus-info-method (gnus-get-info group)))
+   ;; Find the method.
+   (t (gnus-server-to-method (gnus-group-method group)))))
 
 ;; Do Gcc handling, which copied the message over to some group.
 (defun gnus-inews-do-gcc (&optional gcc)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 6e735ac..a63ee2c 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -4779,7 +4779,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       (set (setq var (intern (format "gnus-newsgroup-%s"
                                     (car (rassq (setq mark (car marks))
                                                 types)))))
-          (if (memq (car marks) uncompressed) (cdr marks)
+          (if (memq (car marks) uncompressed)
+              (cdr marks)
             (gnus-uncompress-range (cdr marks))))
 
       (setq articles (symbol-value var))