From 93c1cdc63a2fbbacda6141cdbe1e8ef28e76faa9 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 4 Apr 2004 11:02:08 +0000 Subject: [PATCH] Synch to No Gnus 200404031528. --- lisp/ChangeLog | 4 ++++ lisp/gnus.el | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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 + + * gnus.el (gnus-getenv-nntpserver): Strip whitespace. + 2004-04-02 Teodor Zlatanov * 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 -- 1.7.10.4