Commit 14e20e13 authored by Miles Bader's avatar Miles Bader
Browse files

Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-585

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38
   Update from CVS
parent 30857a61
2004-09-29 Jesper Harder <harder@ifa.au.dk>
* gnus.el (gnus-method-to-server): Oops, move it don't delete it.
2004-09-28 Jesper Harder <harder@ifa.au.dk>
* gnus-picon.el: Require cl.
......
......@@ -3261,6 +3261,38 @@ that that variable is buffer-local to the summary buffers."
(nth 1 method))))
method)))
(defsubst gnus-method-to-server (method)
(catch 'server-name
(setq method (or method gnus-select-method))
;; Perhaps it is already in the cache.
(mapc (lambda (name-method)
(if (equal (cdr name-method) method)
(throw 'server-name (car name-method))))
gnus-server-method-cache)
(mapc
(lambda (server-alist)
(mapc (lambda (name-method)
(when (gnus-methods-equal-p (cdr name-method) method)
(unless (member name-method gnus-server-method-cache)
(push name-method gnus-server-method-cache))
(throw 'server-name (car name-method))))
server-alist))
(let ((alists (list gnus-server-alist
gnus-predefined-server-alist)))
(if gnus-select-method
(push (list (cons "native" gnus-select-method)) alists))
alists))
(let* ((name (if (member (cadr method) '(nil ""))
(format "%s" (car method))
(format "%s:%s" (car method) (cadr method))))
(name-method (cons name method)))
(unless (member name-method gnus-server-method-cache)
(push name-method gnus-server-method-cache))
name)))
(defsubst gnus-server-to-method (server)
"Map virtual server names to select methods."
(or (and server (listp server) server)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment