[Emacs-diffs] /srv/bzr/emacs/trunk r107049: gnus-group.el: Make error reporting when doing `M-g' work again

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107049
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2012-02-01 23:16:56 +0000
message:
  gnus-group.el: Make error reporting when doing `M-g' work again
  nntp.el: Make nntp report connection errors better
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el
  lisp/gnus/nntp.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-01 22:06:29 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-01 23:16:56 +0000
@@ -1,5 +1,12 @@
 2012-02-01  Lars Ingebrigtsen  <address@hidden>
 
+       * 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

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/gnus-group.el   2012-02-01 23:16:56 +0000
@@ -4070,10 +4070,7 @@
              (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

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2012-01-27 14:32:25 +0000
+++ b/lisp/gnus/nntp.el 2012-02-01 23:16:56 +0000
@@ -1385,6 +1385,10 @@
       (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))