diff lisp/gnus/gnus.el @ 72509:59dd12493697

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 126-127) - Merge from emacs--devo--0 - Update from CVS 2006-08-23 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> [ Backported bug fix from No Gnus. ] * lisp/gnus/gnus.el (gnus-find-method-for-group): On killed/unknown groups, try looking up the method using GROUP's prefix before inventing a new one. It is used on killed/unknown groups in various places where returning an all-new method isn't expected by the caller. * lisp/gnus/gnus-util.el (gnus-group-server): Copy required macro from No Gnus. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-410
author Miles Bader <miles@gnu.org>
date Fri, 25 Aug 2006 02:15:02 +0000
parents 29fe34ec2296
children d34b38862f88 6823a91487f2
line wrap: on
line diff
--- a/lisp/gnus/gnus.el	Thu Aug 24 23:40:00 2006 +0000
+++ b/lisp/gnus/gnus.el	Fri Aug 25 02:15:02 2006 +0000
@@ -4079,8 +4079,13 @@
   (or gnus-override-method
       (and (not group)
 	   gnus-select-method)
-      (and (not (gnus-group-entry group)) ;; a new group
-	   (gnus-group-name-to-method group))
+      (and (not (gnus-group-entry group))
+ 	   ;; Killed or otherwise unknown group.
+ 	   (or
+ 	    ;; If we know a virtual server by that name, return its method.
+ 	    (gnus-server-to-method (gnus-group-server group))
+ 	    ;; Guess a new method as last resort.
+ 	    (gnus-group-name-to-method group)))
       (let ((info (or info (gnus-get-info group)))
 	    method)
 	(if (or (not info)