From 02e8d7e970f88a06ff303128ea47190c8bfd2fa9 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 1 Feb 2012 23:16:56 +0000 Subject: [PATCH] gnus-group.el: Make error reporting when doing `M-g' work again nntp.el: Make nntp report connection errors better --- lisp/gnus/ChangeLog | 7 +++++++ lisp/gnus/gnus-group.el | 5 +---- lisp/gnus/nntp.el | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 655bffc8f96..765ba923a51 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,12 @@ 2012-02-01 Lars Ingebrigtsen + * gnus-group.el (gnus-group-get-new-news-this-group): Don't overwrite + the real error message with the useless "previously known to be down". + Which isn't even correct. + + * nntp.el (nntp-open-connection): Report the error message if the nntp + server can't be reached. + * nnimap.el (nnimap-retrieve-group-data-early): Keep track of how many groups we do a total scan for. (nnimap-wait-for-response): Say that we're doing a total scan, if we're diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 3327bbea5a0..60522839a9a 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -4070,10 +4070,7 @@ If DONT-SCAN is non-nil, scan non-activated groups as well." (gnus-agent-save-group-info method (gnus-group-real-name group) active)) (gnus-group-update-group group nil t)) - (if (eq (gnus-server-status (gnus-find-method-for-group group)) - 'denied) - (gnus-error 3 "Server previously determined to be down; not retrying") - (gnus-error 3 "%s error: %s" group (gnus-status-message group))))) + (gnus-error 3 "%s error: %s" group (gnus-status-message group)))) (when beg (goto-char beg)) (when gnus-goto-next-group-when-activating diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 7148fdbb216..98393a61764 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1385,6 +1385,10 @@ password contained in '~/.nntp-authinfo'." (nnheader-cancel-timer timer)) (when (and process (not (memq (process-status process) '(open run)))) + (with-current-buffer pbuffer + (goto-char (point-min)) + (nnheader-report 'nntp "Error when connecting: %s" + (buffer-substring (point) (line-end-position)))) (setq process nil)) (unless process (nntp-kill-buffer pbuffer)) -- 2.39.2