diff lisp/gnus/gnus.el @ 83211:b85b19b8eb65

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-567 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-568 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-569 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-570 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-571 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-572 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-573 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-574 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-575 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-576 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-577 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-578 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-579 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-580 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-31 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-32 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-33 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-34 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-35 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-36 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-37 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-251

--- a/lisp/gnus/gnus.el	Thu Sep 23 13:21:01 2004 +0000
+++ b/lisp/gnus/gnus.el	Wed Sep 29 08:38:15 2004 +0000
@@ -282,7 +282,7 @@
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "5.10.6"
+(defconst gnus-version-number "5.11"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)
@@ -1104,9 +1104,8 @@
       (and (file-readable-p gnus-nntpserver-file)
 	   (with-temp-buffer
 	     (insert-file-contents gnus-nntpserver-file)
-	     (let ((name (buffer-string)))
-	       (unless (string-match "\\`[ \t\n]*$" name)
-		 name))))))
+	     (when (re-search-forward "[^ \t\n\r]+" nil t)
+	       (match-string 0))))))
 
 (defcustom gnus-select-method
   (condition-case nil
@@ -3309,38 +3308,6 @@
           (push (cons server result) gnus-server-method-cache))
 	result)))
 
-(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-get-method (group method)
   ;; Input either a server name, and extended server name, or a
   ;; select method, and return a select method.