diff options
| author | Gnus developers <ding@gnus.org> | 2012-01-07 01:13:52 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-01-07 01:13:52 +0000 |
| commit | e7719ea1b23a7dc81993320f851c6e94d563dee4 (patch) | |
| tree | 905450cd1f8faa119433078af081b6f965109662 /lisp/gnus/nntp.el | |
| parent | adf4e762813e58cd7b68982d448269965bb45616 (diff) | |
| download | emacs-e7719ea1b23a7dc81993320f851c6e94d563dee4.tar.gz | |
Merge changes made in Gnus trunk.
2012-01-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Group Parameters): Really note precedence.
2012-01-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
* mm-decode.el (mm-interactively-view-part): Use `completing-read',
since ido doesn't work on symbols (bug#9632).
* gnus.el (gnus-group-fast-parameter): Use the same precedence rules
when getting a single value as when getting all the values. This means
that atoms like `gcc-self' work cumulatively, like variable settings,
instead of getting the value from the last matching clause.
(gnus-group-find-parameter): Protect against the group buffer not
existing (bug#9585).
2012-01-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-start.el (gnus-activate-group): Document more parameters
(bug#9694).
* gnus-group.el (gnus-group-read-ephemeral-group): Doc clarification
(bug#9692).
* gnus-agent.el (gnus-agent-store-article): Tell the Agent when the
article was fetched, so that it can be expired later (bug#9958).
(gnus-agent-summary-fetch-series): Add doc string.
(gnus-agent-summary-fetch-group): Don't remove tick and dormant marks
(bug#9517).
* nntp.el (nntp-retrieve-groups): Refuse to do retrieval when an async
retrieval is happening.
* gnus.el (gnus-parameters): Doc fix.
2012-01-06 Dave Abrahams <dave@boostpro.com> (tiny change)
* gnus-sum.el (gnus-summary-refer-thread): If the subtree is hidden,
show the thread after expansion.
2012-01-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-art.el (article-narrow-to-head): If the head is completely
empty, narrow to the empty region (bug#9764).
* gnus-sum.el (gnus-summary-mark-article-as-unread): Mark articles as
read, and then mark them as unread only when the unread mark is used.
This makes `C-- T k' actually work, even though it's confusing.
* gnus-win.el (gnus-all-windows-visible-p): Ensure that the buffer is
alive before we try to find its window.
2012-01-06 Brian Sniffen <bsniffen@akamai.com> (tiny change)
* mm-decode.el (mm-display-external): Use a longer timeout for the
deletion to allow slow programs to display the file.
2012-01-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-art.el (gnus-article-browse-delete-temp-files): Fix up the
prompt to be less confusing.
Diffstat (limited to 'lisp/gnus/nntp.el')
| -rw-r--r-- | lisp/gnus/nntp.el | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index e089dfbe106..db9d9e252be 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -847,7 +847,14 @@ command whose response triggered the error." "Retrieve group info on GROUPS." (nntp-with-open-group nil server - (when (nntp-find-connection-buffer nntp-server-buffer) + (when (and (nntp-find-connection-buffer nntp-server-buffer) + (with-current-buffer + (nntp-find-connection-buffer nntp-server-buffer) + (if (not nntp-retrieval-in-progress) + t + (message "Warning: Refusing to do retrieval from %s because a retrieval is already happening" + server) + nil))) (catch 'done (save-excursion ;; Erase nntp-server-buffer before nntp-inhibit-erase. |