X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fnnvirtual.el;h=48293412b2b56813af7233b5fca336d85940e007;hb=53c586a2cd0c1272745f6082e39eb9a03669d10b;hp=b1d4119ae0f6a5718dc4285b3e80845ee5e18ca5;hpb=3744aa624a1af97f360196755fdeeb6382da8aca;p=elisp%2Fgnus.git-

diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el
index b1d4119..4829341 100644
--- a/lisp/nnvirtual.el
+++ b/lisp/nnvirtual.el
@@ -385,7 +385,7 @@ to virtual article number.")
     (insert "\t"))
 
   ;; Remove any spaces at the beginning of the Xref field.
-  (while (eq (char-after (1- (point))) ? )
+  (while (= (char-after (1- (point))) ? )
     (forward-char -1)
     (delete-char 1))
 
@@ -417,7 +417,7 @@ to virtual article number.")
 
   ;; Ensure a trailing \t.
   (end-of-line)
-  (or (eq (char-after (1- (point))) ?\t)
+  (or (= (char-after (1- (point))) ?\t)
       (insert ?\t)))
 
 
@@ -436,21 +436,17 @@ If UPDATE-P is not nil, call gnus-group-update-group on the components."
 			(nnvirtual-partition-sequence
 			 (gnus-list-of-unread-articles
 			  (nnvirtual-current-group)))))
-	  (type-marks
-	   (delq nil
-		 (mapcar (lambda (ml)
-			   (if (eq (car ml) 'score)
-			       nil
-			     (cons (car ml)
-				   (nnvirtual-partition-sequence (cdr ml)))))
-			 (gnus-info-marks (gnus-get-info
-					   (nnvirtual-current-group))))))
+	  (type-marks (mapcar (lambda (ml)
+				(cons (car ml)
+				      (nnvirtual-partition-sequence (cdr ml))))
+			      (gnus-info-marks (gnus-get-info
+						(nnvirtual-current-group)))))
 	  mark type groups carticles info entry)
 
       ;; Ok, atomically move all of the (un)read info, clear any old
       ;; marks, and move all of the current marks.  This way if someone
       ;; hits C-g, you won't leave the component groups in a half-way state.
-      (progn
+      (gnus-atomic-progn
 	;; move (un)read
 	(let ((gnus-newsgroup-active nil)) ;workaround guns-update-read-articles
 	  (while (setq entry (pop unreads))
@@ -461,11 +457,7 @@ If UPDATE-P is not nil, call gnus-group-update-group on the components."
 	(while groups
 	  (when (and (setq info (gnus-get-info (pop groups)))
 		     (gnus-info-marks info))
-	    (gnus-info-set-marks
-	     info
-	     (if (assq 'score (gnus-info-marks info))
-		 (list (assq 'score (gnus-info-marks info)))
-	       nil))))
+	    (gnus-info-set-marks info nil)))
 
 	;; Ok, currently type-marks is an assq list with keys of a mark type,
 	;; with data of an assq list with keys of component group names