From: yamaoka <yamaoka>
Date: Tue, 19 Oct 2004 05:41:13 +0000 (+0000)
Subject: Synch to No Gnus 200410190540.
X-Git-Tag: t-gnus-6_17_4-quimby-~702
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=de20a716df65a12481926540448f2b89cb9acd07;p=elisp%2Fgnus.git-

Synch to No Gnus 200410190540.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31f61a6..8560412 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-sum.el (gnus-update-summary-mark-positions): Search for
+	dummy marks in the right way.
+
 2004-10-18  David Edmondson  <dme@dme.org>
 
 	* mm-view.el (mm-w3m-cid-retrieve-1): Don't use recursive call
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 7eaabc9..55a449b 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3277,7 +3277,13 @@ buffer that was in action when the last article was fetched."
       (save-excursion
 	(gnus-set-work-buffer)
 	(let ((gnus-summary-line-format-spec spec)
-	      (gnus-newsgroup-downloadable '(0)))
+	      (gnus-newsgroup-downloadable '(0))
+	      marks)
+	  (insert ?\200 "\200" ?\201 "\201" ?\202 "\202" ?\203 "\203")
+	  (while (not (bobp))
+	    (push (buffer-substring (1- (point)) (point)) marks)
+	    (backward-char))
+	  (erase-buffer)
 	  (gnus-summary-insert-line
 	   (make-full-mail-header 0 "" "nobody"
 				  "05 Apr 2001 23:33:09 +0400"
@@ -3285,22 +3291,22 @@ buffer that was in action when the last article was fetched."
 	   0 nil t 128 t nil "" nil 1)
 	  (goto-char (point-min))
 	  (setq pos (list (cons 'unread
-				(and (search-forward
-				      (string-as-multibyte "\200") nil t)
+				(and (or (search-forward (nth 0 marks) nil t)
+					 (search-forward (nth 1 marks) nil t))
 				     (- (point) (point-min) 1)))))
 	  (goto-char (point-min))
-	  (push (cons 'replied (and (search-forward
-				     (string-as-multibyte "\201") nil t)
+	  (push (cons 'replied (and (or (search-forward (nth 2 marks) nil t)
+					(search-forward (nth 3 marks) nil t))
 				    (- (point) (point-min) 1)))
 		pos)
 	  (goto-char (point-min))
-	  (push (cons 'score (and (search-forward
-				   (string-as-multibyte "\202") nil t)
+	  (push (cons 'score (and (or (search-forward (nth 4 marks) nil t)
+				      (search-forward (nth 5 marks) nil t))
 				  (- (point) (point-min) 1)))
 		pos)
 	  (goto-char (point-min))
-	  (push (cons 'download (and (search-forward
-				      (string-as-multibyte "\203") nil t)
+	  (push (cons 'download (and (or (search-forward (nth 6 marks) nil t)
+					 (search-forward (nth 7 marks) nil t))
 				     (- (point) (point-min) 1)))
 		pos)))
       (setq gnus-summary-mark-positions pos))))