Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cdd42c2..0e96572 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-26  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
+
+       * nnimap.el (nnimap-request-article-part): Try harder to show
+       group name in debugging message.
+
 2002-10-25  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
 
        * gnus-agent.el (gnus-agent-save-fetched-headers): Create

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 4a0d8a4..ba0f5d5 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -809,7 +809,8 @@ function is generally only called when Gnus is shutting down."
                     article)))
       (when article
        (gnus-message 10 "nnimap: Fetching (part of) article %d from %s..."
-                     article (or group imap-current-mailbox))
+                     article (or group imap-current-mailbox
+                                 gnus-newsgroup-name))
        (if (not nnheader-callback-function)
            (with-current-buffer (or to-buffer nntp-server-buffer)
              (erase-buffer)
@@ -820,10 +821,11 @@ function is generally only called when Gnus is shutting down."
                  (nnheader-ms-strip-cr)
                  (gnus-message
                   10 "nnimap: Fetching (part of) article %d from %s...done"
-                  article (or group imap-current-mailbox))
+                  article (or group imap-current-mailbox gnus-newsgroup-name))
                  (if (bobp)
                      (nnheader-report 'nnimap "No such article %d in %s: %s"
-                                      article (or group imap-current-mailbox)
+                                      article (or group imap-current-mailbox
+                                                  gnus-newsgroup-name)
                                       (imap-error-text nnimap-server-buffer))
                    (cons group article)))))
          (add-hook 'imap-fetch-data-hook 'nnimap-callback)