gnus-group.el: Make error reporting when doing `M-g' work again

nntp.el: Make nntp report connection errors better

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 655bffc8f96e4d6bbbda02180e576a9cd5ec9e9b..765ba923a514d8480ffb474d6dad7c4cf842d742 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,12 @@
 2012-02-01  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * 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 3327bbea5a0013448c0175f2a4e9d86fc18e71d0..60522839a9a3fe61695f38e8009e20bcc219d7e8 100644 (file)
--- 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 7148fdbb216a221b37ce437cb0a657806ba970ba..98393a617648f8df2d38ac742e14080f7ee10d23 100644 (file)
--- 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))