From: yamaoka <yamaoka>
Date: Wed, 29 Aug 2001 22:14:41 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: semi-gnus~52
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=90715c247bf553cc2b3d32fc8dcd485230d6d4da;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edf0a93..31b796e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-29 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-sum.el (gnus-summary-move-article): Only update marks of
+	type 'list.
+
 2001-08-29 00:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* flow-fill.el (fill-flowed): eol might be point-max.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3537c3f..ba32f04 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8278,21 +8278,22 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
 		  (setcdr gnus-newsgroup-active to-article))
 
 		(while marks
-		  (when (memq article (symbol-value
-				       (intern (format "gnus-newsgroup-%s"
-						       (caar marks)))))
-		    (push (cdar marks) to-marks)
-		    ;; If the other group is the same as this group,
-		    ;; then we have to add the mark to the list.
-		    (when (equal to-group gnus-newsgroup-name)
-		      (set (intern (format "gnus-newsgroup-%s" (caar marks)))
-			   (cons to-article
-				 (symbol-value
-				  (intern (format "gnus-newsgroup-%s"
-						  (caar marks)))))))
-		    ;; Copy the marks to other group.
-		    (gnus-add-marked-articles
-		     to-group (cdar marks) (list to-article) info))
+		  (when (eq (gnus-article-mark-to-type (cdar marks)) 'list)
+		    (when (memq article (symbol-value
+					 (intern (format "gnus-newsgroup-%s"
+							 (caar marks)))))
+		      (push (cdar marks) to-marks)
+		      ;; If the other group is the same as this group,
+		      ;; then we have to add the mark to the list.
+		      (when (equal to-group gnus-newsgroup-name)
+			(set (intern (format "gnus-newsgroup-%s" (caar marks)))
+			     (cons to-article
+				   (symbol-value
+				    (intern (format "gnus-newsgroup-%s"
+						    (caar marks)))))))
+		      ;; Copy the marks to other group.
+		      (gnus-add-marked-articles
+		       to-group (cdar marks) (list to-article) info)))
 		  (setq marks (cdr marks)))
 
 		(gnus-request-set-mark to-group (list (list (list to-article)
diff --git a/texi/ChangeLog b/texi/ChangeLog
index b044562..5c9e67f 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-29  Simon Josefsson  <jas@extundo.com>
+	From Anders Jackson <jackson@hig.se>
+
+	* gnus.texi (Group Parameters): Fix.
+
 2001-08-27  Simon Josefsson  <jas@extundo.com>
 
 	* gnus.texi (Archiving Mail): Add.
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 31de2ca..6c17311 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -2858,7 +2858,7 @@ See also @code{gnus-group-charset-alist}.
 
 @item ignored-charsets
 @cindex ignored-charsets
-Elements that look like @code{(ignored-charsets x-known iso-8859-1)}
+Elements that look like @code{(ignored-charsets x-unknown iso-8859-1)}
 will make @code{iso-8859-1} and @code{x-unknown} ignored; that is, the
 default charset will be used for decoding articles.
 
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 3674df9..994e8cb 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -2776,7 +2776,7 @@ See also @code{gnus-group-charset-alist}.
 
 @item ignored-charsets
 @cindex ignored-charset
-Elements that look like @code{(ignored-charsets x-known iso-8859-1)}
+Elements that look like @code{(ignored-charsets x-unknown iso-8859-1)}
 will make @code{iso-8859-1} and @code{x-unknown} ignored; that is, the
 default charset will be used for decoding articles.