From: yamaoka <yamaoka>
Date: Tue, 13 Apr 1999 05:26:39 +0000 (+0000)
Subject: * (gnus-summary-move-article): Fix, `gnus-article-mark-lists' will be broken
X-Git-Tag: t-gnus-6_10_062-09~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac7329b36766aced9f13e9b8d21232bffe895162;p=elisp%2Fgnus.git-

* (gnus-summary-move-article): Fix, `gnus-article-mark-lists' will be broken
by side effect.
;; By courtesy of Keiichi-san.
---

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 25b5e3a..5eb6eb8 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7088,6 +7088,9 @@ and `request-accept' functions."
 		 (crosspost "Crosspost" "Crossposting")))
 	(copy-buf (save-excursion
 		    (nnheader-set-temp-buffer " *copy article*")))
+	(default-marks gnus-article-mark-lists)
+	(no-expire-marks (delete '(expirable . expire)
+				 (copy-sequence gnus-article-mark-lists)))
 	art-group to-method new-xref article to-groups)
     (unless (assq action names)
       (error "Unknown action %s" action))
@@ -7193,11 +7196,10 @@ and `request-accept' functions."
 				       (list (cdr art-group)))))
 
 	    ;; Copy any marks over to the new group.
-	    (let ((marks gnus-article-mark-lists)
+	    (let ((marks (if (gnus-group-auto-expirable-p to-group)
+			     default-marks
+			   no-expire-marks))
 		  (to-article (cdr art-group)))
-	      (unless (gnus-group-auto-expirable-p to-group)
-		(setq marks (delete '(expirable . expire)
-				    (copy-sequence marks))))
 
 	      ;; See whether the article is to be put in the cache.
 	      (when gnus-use-cache