[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103152: nntp.el (nntp-finish-retriev
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103152: nntp.el (nntp-finish-retrieve-group-infos): Protect against the first part not returning any data. |
Date: |
Sun, 06 Feb 2011 22:27:28 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103152
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 22:27:28 +0000
message:
nntp.el (nntp-finish-retrieve-group-infos): Protect against the first part
not returning any data.
proto-stream.el (open-protocol-stream): Document the return value.
modified:
lisp/gnus/ChangeLog
lisp/gnus/nntp.el
lisp/gnus/proto-stream.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-02-06 12:48:19 +0000
+++ b/lisp/gnus/ChangeLog 2011-02-06 22:27:28 +0000
@@ -1,3 +1,10 @@
+2011-02-06 Lars Ingebrigtsen <address@hidden>
+
+ * nntp.el (nntp-finish-retrieve-group-infos): Protect against the first
+ part not returning any data.
+
+ * proto-stream.el (open-protocol-stream): Document the return value.
+
2011-02-06 Julien Danjou <address@hidden>
* message.el (message-setup-1): Handle message-generate-headers-first
=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2011-01-31 03:35:09 +0000
+++ b/lisp/gnus/nntp.el 2011-02-06 22:27:28 +0000
@@ -781,7 +781,8 @@
;; The first time this is run, this variable is `try'. So we
;; try.
(when (eq nntp-server-list-active-group 'try)
- (nntp-try-list-active (gnus-group-real-name (gnus-info-group (car
infos)))))
+ (nntp-try-list-active
+ (gnus-group-real-name (gnus-info-group (car infos)))))
(with-current-buffer (nntp-find-connection-buffer nntp-server-buffer)
(erase-buffer)
(let ((nntp-inhibit-erase t)
@@ -800,7 +801,8 @@
(car infos)))
(received 0)
(last-point 1))
- (when buf
+ (when (and buf
+ count)
(with-current-buffer buf
(while (and (gnus-buffer-live-p buf)
(progn
=== modified file 'lisp/gnus/proto-stream.el'
--- a/lisp/gnus/proto-stream.el 2011-01-25 23:51:40 +0000
+++ b/lisp/gnus/proto-stream.el 2011-02-06 22:27:28 +0000
@@ -94,7 +94,15 @@
:starttls-function -- a function that takes one parameter, which
is the response to the capaibility command. It should return nil
if it turns out that the server doesn't support STARTTLS, or the
-command to switch on STARTTLS otherwise."
+command to switch on STARTTLS otherwise.
+
+The return value from this function is a four-element list, where
+the first element is the stream (if connection was successful);
+the second element is the \"greeting\", i. e., the string the
+server sent over on initial contact; the third element is the
+capability string; and the fourth element is either `network' or
+`tls', depending on whether the connection ended up being
+encrypted or not."
(let ((type (or (cadr (memq :type parameters)) 'network)))
(cond
((eq type 'starttls)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103152: nntp.el (nntp-finish-retrieve-group-infos): Protect against the first part not returning any data.,
Katsumi Yamaoka <=