X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-start.el;h=44d4259bc364eb16400c91d5e40ddfea0a452a62;hp=88010fd58e76f4e04fdf2bf5102f7cf60ca959de;hb=4c8ac1de702070b297937180455caaefab483e13;hpb=92c8f2356f72947613f87e73cbe7c54fb498f2e8

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 88010fd58..44d4259bc 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1504,8 +1504,6 @@ backend check whether the group actually exists."
 	     ;; Return the new active info.
 	     active)))))
 
-(defvar gnus-propagate-marks)		; gnus-sum
-
 (defun gnus-get-unread-articles-in-group (info active &optional update)
   (when (and info active)
     ;; Allow the backend to update the info in the group.
@@ -1515,13 +1513,6 @@ backend check whether the group actually exists."
 			      (gnus-info-group info)))))
       (gnus-activate-group (gnus-info-group info) nil t))
 
-    ;; Allow backends to update marks,
-    (when gnus-propagate-marks
-      (let ((method (inline (gnus-find-method-for-group
-			     (gnus-info-group info)))))
-	(when (gnus-check-backend-function 'request-marks (car method))
-	  (gnus-request-marks info method))))
-
     (let* ((range (gnus-info-read info))
 	   (num 0))
 
@@ -2303,7 +2294,20 @@ If FORCE is non-nil, the .newsrc file is read."
 	  (gnus-message 5 "Reading %s...done" newsrc-file)))
 
       ;; Convert old to new.
-      (gnus-convert-old-newsrc))))
+      (gnus-convert-old-newsrc)
+      (gnus-clean-old-newsrc))))
+
+(defun gnus-clean-old-newsrc (&optional force)
+  (when gnus-newsrc-file-version
+    (when (or force
+	      (< (gnus-continuum-version gnus-newsrc-file-version)
+		 (gnus-continuum-version "Ma Gnus v0.03")))
+      ;; Remove old `exist' marks from old nnimap groups.
+      (dolist (info (cdr gnus-newsrc-alist))
+	(let ((exist (assoc 'unexist (gnus-info-marks info))))
+	  (when exist
+	    (gnus-info-set-marks
+	     info (delete exist (gnus-info-marks info)))))))))
 
 (defun gnus-convert-old-newsrc ()
   "Convert old newsrc formats into the current format, if needed."