summaryrefslogtreecommitdiff
path: root/lisp/gnus/nntp.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-06-15 04:03:46 +0000
committerMiles Bader <miles@gnu.org>2007-06-15 04:03:46 +0000
commit5cedca8d0e8e48e6c1db95aac6571a56e653ce02 (patch)
tree99e36759b7ebd683bca9a52359f278e4a0304108 /lisp/gnus/nntp.el
parentd3ab2b63f1dab3686d9156050f54d6a475bf30bc (diff)
downloademacs-5cedca8d0e8e48e6c1db95aac6571a56e653ce02.tar.gz
Merge from gnus--rel--5.10
Patches applied: * gnus--rel--5.10 (patch 230-231) - ChangeLog tweak - Update from CVS 2007-06-14 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-agent.el (gnus-agent-fetch-headers) (gnus-agent-retrieve-headers): Bind gnus-decode-encoded-address-function to identity. * lisp/gnus/nntp.el (nntp-send-xover-command): Recognize an xover command is available also when the server returns simply a dot. * lisp/gnus/gnus-ems.el (gnus-x-splash): Redisplay window before measuring it. Revision: emacs@sv.gnu.org/emacs--rel--22--patch-48
Diffstat (limited to 'lisp/gnus/nntp.el')
-rw-r--r--lisp/gnus/nntp.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 25b924a93e7..2b62cd7fffa 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1580,7 +1580,8 @@ password contained in '~/.nntp-authinfo'."
;; article number. How... helpful.
(progn
(forward-line 1)
- (looking-at "[0-9]+\t...")) ; More text after number.
+ ;; More text after number, or a dot.
+ (looking-at "[0-9]+\t...\\|\\.\r?\n"))
(setq nntp-server-xover (car commands))))
(setq commands (cdr commands)))
;; If none of the commands worked, we disable XOVER.