Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
72508:5d642f9eff22 | 72509:59dd12493697 |
---|---|
4077 (defun gnus-find-method-for-group (group &optional info) | 4077 (defun gnus-find-method-for-group (group &optional info) |
4078 "Find the select method that GROUP uses." | 4078 "Find the select method that GROUP uses." |
4079 (or gnus-override-method | 4079 (or gnus-override-method |
4080 (and (not group) | 4080 (and (not group) |
4081 gnus-select-method) | 4081 gnus-select-method) |
4082 (and (not (gnus-group-entry group)) ;; a new group | 4082 (and (not (gnus-group-entry group)) |
4083 (gnus-group-name-to-method group)) | 4083 ;; Killed or otherwise unknown group. |
4084 (or | |
4085 ;; If we know a virtual server by that name, return its method. | |
4086 (gnus-server-to-method (gnus-group-server group)) | |
4087 ;; Guess a new method as last resort. | |
4088 (gnus-group-name-to-method group))) | |
4084 (let ((info (or info (gnus-get-info group))) | 4089 (let ((info (or info (gnus-get-info group))) |
4085 method) | 4090 method) |
4086 (if (or (not info) | 4091 (if (or (not info) |
4087 (not (setq method (gnus-info-method info))) | 4092 (not (setq method (gnus-info-method info))) |
4088 (equal method "native")) | 4093 (equal method "native")) |