From: Simon Josefsson <jas@extundo.com>
Date: Sun, 30 Nov 2003 17:30:56 +0000 (+0000)
Subject: (gnus-agent-expire-group-1): Bind message-log-max
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=f1bb73a268a003cfb4feea035c27fa0ec0655e60;p=gnus

(gnus-agent-expire-group-1): Bind message-log-max
when messaging "X % completed" to inhibit logging them to the
message buffer.
(gnus-agent-expire-group-1): Mention group name in messages.
(gnus-agent-expire-group-1): Only print a message for an article
when there actually was something done to it.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d55cf228..4fa312f26 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2003-11-30  Simon Josefsson  <jas@extundo.com>
 
+	* gnus-agent.el (gnus-agent-expire-group-1): Bind message-log-max
+	when messaging "X % completed" to inhibit logging them to the
+	message buffer.
+	(gnus-agent-expire-group-1): Mention group name in messages.
+	(gnus-agent-expire-group-1): Only print a message for an article
+	when there actually was something done to it.
+
 	* mm-util.el (mm-enable-multibyte): Call set-buffer-multibyte with
 	'to argument.  Fixes something or other in Emacs 22, and is
 	backwards compatible.  From Kenichi Handa <handa@m17n.org>.
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 28544b896..e0a8ff3d3 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -2725,7 +2725,8 @@ line." (point) nov-file)))
           (while dlist
             (let ((new-completed (truncate (* 100.0
                                               (/ (setq cnt (1+ cnt))
-                                                 len)))))
+                                                 len))))
+		  message-log-max)
               (when (> new-completed completed)
                 (setq completed new-completed)
                 (gnus-message 7 "%3d%% completed..."  completed)))
@@ -2739,16 +2740,16 @@ line." (point) nov-file)))
                ;; Kept articles are unread, marked, or special.
                (keep
                 (gnus-agent-message 10
-                                    "gnus-agent-expire: Article %d: Kept %s article%s."
-                                    article-number keep (if fetch-date " and file" ""))
+                                    "gnus-agent-expire: %s:%d: Kept %s article%s."
+                                    group article-number keep (if fetch-date " and file" ""))
                 (when fetch-date
                   (unless (file-exists-p
                            (concat dir (number-to-string
                                         article-number)))
                     (setf (nth 1 entry) nil)
                     (gnus-agent-message 3 "gnus-agent-expire cleared \
-download flag on article %d as the cached article file is missing."
-                                        (caar dlist)))
+download flag on %s:%d as the cached article file is missing."
+                                        group (caar dlist)))
                   (unless marker
                     (gnus-message 1 "gnus-agent-expire detected a \
 missing NOV entry.  Run gnus-agent-regenerate-group to restore it.")))
@@ -2816,13 +2817,14 @@ missing NOV entry.  Run gnus-agent-regenerate-group to restore it.")))
                     (push (format "Removed %s article number from \
 article alist" type) actions))
 
-                  (gnus-agent-message 8 "gnus-agent-expire: Article %d: %s"
-                                      article-number
-                                      (mapconcat 'identity actions ", "))))
+		  (when actions
+		    (gnus-agent-message 8 "gnus-agent-expire: %s:%d: %s"
+					group article-number
+					(mapconcat 'identity actions ", ")))))
                (t
                 (gnus-agent-message
-                 10 "gnus-agent-expire: Article %d: Article kept as \
-expiration tests failed." article-number)
+                 10 "gnus-agent-expire: %s:%d: Article kept as \
+expiration tests failed." group article-number)
                 (gnus-agent-append-to-list
                  tail-alist (cons article-number fetch-date)))
                )