Synch to No Gnus 200511100033.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9be038..2c8447e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-start.el (gnus-1): Add "native" to
+       gnus-predefined-server-alist.
+
+       * gnus.el (gnus-method-to-server): Don't add "native" to the
+       lists here, because that leads to problems when
+       gnus-select-method is bound.
+
 2005-11-09  Simon Josefsson  <jas@extundo.com>
 
        * gnus-sum.el (gnus-article-sort-by-date-reverse): Remove,

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index f7c579d..af8a1df 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -773,6 +773,13 @@ prompt the user for the name of an NNTP server to use."
     (nnheader-init-server-buffer)
     (setq gnus-slave slave)
     (gnus-read-init-file)
+
+    ;; Add "native" to gnus-predefined-server-alist just to have a
+    ;; name for the native select method.
+    (when gnus-select-method
+      (push (cons "native" gnus-select-method)
+           gnus-predefined-server-alist))
+    
     (if gnus-agent
        (gnus-agentize))
 

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 2c3b0bd..d5f9e9e 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -3573,11 +3573,8 @@ that that variable is buffer-local to the summary buffers."
                    (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))
+     (list gnus-server-alist
+          gnus-predefined-server-alist))
 
     (let* ((name (if (member (cadr method) '(nil ""))
                      (format "%s" (car method))