From: yamaoka <yamaoka>
Date: Sat, 18 Dec 2004 03:35:31 +0000 (+0000)
Subject: Synch to No Gnus 200412180037.
X-Git-Tag: t-gnus-6_17_4-quimby-~627
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04b1e112872e7d0e3287369a6e78e5e1095b931b;p=elisp%2Fgnus.git-

Synch to No Gnus 200412180037.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9088846..72463d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-17  Paul Jarc  <prj@po.cwru.edu>
+
+	* nnmaildir.el (nnmaildir-request-expire-articles): Articles moved
+	by expiry now get marked as read.
+
 2004-12-17  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-util.el (mm-xemacs-find-mime-charset): New macro.
diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index e3a2ba0..337fb38 100644
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -41,6 +41,8 @@
 ;;   copying, restoring, etc.
 ;;
 ;; Todo:
+;; * When moving an article for expiry, copy all the marks except 'expire
+;;   from the original article.
 ;; * Add a hook for when moving messages from new/ to cur/, to support
 ;;   nnmail's duplicate detection.
 ;; * Improve generated Xrefs, so crossposts are detectable.
@@ -1517,7 +1519,12 @@ by nnmaildir-request-article.")
 			(not (string-equal target pgname))) ;; Move it.
 	       (erase-buffer)
 	       (nnheader-insert-file-contents nnmaildir--file)
-	       (gnus-request-accept-article target nil nil 'no-encode))
+	       (let ((group-art (gnus-request-accept-article
+				 target nil nil 'no-encode)))
+		 (when (consp group-art)
+		   ;; Maybe also copy: dormant forward reply save tick
+		   ;; (gnus-add-mark? gnus-request-set-mark?)
+		   (gnus-group-mark-article-read target (cdr group-art)))))
 	     (if (equal target pgname)
 		 ;; Leave it here.
 		 (setq didnt (cons (nnmaildir--art-num article) didnt))