Synch to No Gnus 200404031528.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09feac0..2ef6c9b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-03  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.el (gnus-getenv-nntpserver): Strip whitespace.
+
 2004-04-02  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-set-difference): new function to replace

diff --git a/lisp/gnus.el b/lisp/gnus.el
index cca8485..849e840 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1137,9 +1137,8 @@ Check the NNTPSERVER environment variable and the
       (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