From: yamaoka <yamaoka>
Date: Sun, 4 Apr 2004 11:02:08 +0000 (+0000)
Subject: Synch to No Gnus 200404031528.
X-Git-Tag: t-gnus-6_17_4-quimby-~989
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=93c1cdc63a2fbbacda6141cdbe1e8ef28e76faa9;p=elisp%2Fgnus.git-

Synch to No Gnus 200404031528.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 09feac0..2ef6c9b 100644
--- 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
--- 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