From: yamaoka <yamaoka>
Date: Wed, 13 Sep 2000 12:58:41 +0000 (+0000)
Subject: Synch with Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~103
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=18c60a14f95aed00a4a97470e950aa30aa9fedcd;p=elisp%2Fgnus.git-

Synch with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd870b9..bfacca5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-12  Simon Josefsson  <simon@josefsson.org>
+
+	* gnus-sum.el (gnus-update-read-articles): Undo
+	`gnus-request-set-mark' operation.
+
 2000-09-11  Dave Love  <fx@gnu.org>
 
 	* Changelog: Use iso-2022 coding.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 6dcfa1f..f2dedc8 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9629,23 +9629,32 @@ If REVERSE, save parts that do not match TYPE."
       (if compute
 	  read
 	(save-excursion
-	  (set-buffer gnus-group-buffer)
-	  (gnus-undo-register
-	    `(progn
-	       (gnus-info-set-marks ',info ',(gnus-info-marks info) t)
-	       (gnus-info-set-read ',info ',(gnus-info-read info))
-	       (gnus-get-unread-articles-in-group ',info (gnus-active ,group))
-	       (gnus-group-update-group ,group t))))
-	;; Propagate the read marks to the backend.
-	(if (gnus-check-backend-function 'request-set-mark group)
-	    (let ((del (gnus-remove-from-range (gnus-info-read info) read))
-		  (add (gnus-remove-from-range read (gnus-info-read info))))
-	      (when (or add del)
-		(unless (gnus-check-group group)
-		  (error "Can't open server for %s" group))
-		(gnus-request-set-mark
-		 group (delq nil (list (if add (list add 'add '(read)))
-				       (if del (list del 'del '(read)))))))))
+	  (let (setmarkundo)
+	    ;; Propagate the read marks to the backend.
+	    (when (gnus-check-backend-function 'request-set-mark group)
+	      (let ((del (gnus-remove-from-range (gnus-info-read info) read))
+		    (add (gnus-remove-from-range read (gnus-info-read info))))
+		(when (or add del)
+		  (unless (gnus-check-group group)
+		    (error "Can't open server for %s" group))
+		  (gnus-request-set-mark
+		   group (delq nil (list (if add (list add 'add '(read)))
+					 (if del (list del 'del '(read))))))
+		  (setq setmarkundo
+			`(gnus-request-set-mark
+			  ,group
+			  ',(delq nil (list
+				       (if del (list del 'add '(read)))
+				       (if add (list add 'del '(read))))))))))
+	    (set-buffer gnus-group-buffer)
+	    (gnus-undo-register
+	      `(progn
+		 (gnus-info-set-marks ',info ',(gnus-info-marks info) t)
+		 (gnus-info-set-read ',info ',(gnus-info-read info))
+		 (gnus-get-unread-articles-in-group ',info 
+						    (gnus-active ,group))
+		 (gnus-group-update-group ,group t)
+		 ,setmarkundo))))
 	;; Enter this list into the group info.
 	(gnus-info-set-read info read)
 	;; Set the number of unread articles in gnus-newsrc-hashtb.