Mercurial > emacs
comparison lisp/gnus/gnus.el @ 57243:c5e16264557d
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-34
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-35
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-36
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 27 Sep 2004 07:44:44 +0000 |
| parents | 497f0d2ca551 |
| children | b73fb1c2fd4c |
comparison
equal
deleted
inserted
replaced
| 57242:ffd8d52f457c | 57243:c5e16264557d |
|---|---|
| 1102 `gnus-nntpserver-file' file." | 1102 `gnus-nntpserver-file' file." |
| 1103 (or (getenv "NNTPSERVER") | 1103 (or (getenv "NNTPSERVER") |
| 1104 (and (file-readable-p gnus-nntpserver-file) | 1104 (and (file-readable-p gnus-nntpserver-file) |
| 1105 (with-temp-buffer | 1105 (with-temp-buffer |
| 1106 (insert-file-contents gnus-nntpserver-file) | 1106 (insert-file-contents gnus-nntpserver-file) |
| 1107 (let ((name (buffer-string))) | 1107 (when (re-search-forward "[^ \t\n\r]+" nil t) |
| 1108 (unless (string-match "\\`[ \t\n]*$" name) | 1108 (match-string 0)))))) |
| 1109 name)))))) | |
| 1110 | 1109 |
| 1111 (defcustom gnus-select-method | 1110 (defcustom gnus-select-method |
| 1112 (condition-case nil | 1111 (condition-case nil |
| 1113 (nconc | 1112 (nconc |
| 1114 (list 'nntp (or (condition-case nil | 1113 (list 'nntp (or (condition-case nil |