gnus-start.el (gnus-clean-old-newsrc): Always remove 'unexist' marks if `gnus-newsrc...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7d4d9a0d667ba38be8646181673ce053d3430149..006b415b180aff283b8260c00fd704075aae3c79 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-10  David Engster  <deng@randomsample.de>
+
+       * gnus-start.el (gnus-clean-old-newsrc): Always remove 'unexist' marks
+       if `gnus-newsrc-file-version' does not match `gnus-version'.  This
+       fixes a bug in Emacs trunk where the 'unexist' marks were always
+       removed at startup because "Gnus v5.13" was considered smaller than "Ma
+       Gnus v0.03".
+
 2013-07-10  Tassilo Horn  <tsdh@gnu.org>
 
        * gnus.el (gnus-summary-line-format): Reference

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 084af884930ac28222db2305d7a5fb24f66c51af..94803800e0bd832f51bca55174954b0489261017 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2314,8 +2314,9 @@ If FORCE is non-nil, the .newsrc file is read."
          (gnus-info-set-marks
           info (delete exist (gnus-info-marks info))))))
     (when (or force
-             (< (gnus-continuum-version gnus-newsrc-file-version)
-                (gnus-continuum-version "Ma Gnus v0.03")))
+             (not (string= gnus-newsrc-file-version gnus-version)))
+      (message (concat "Removing unexist marks because newsrc "
+                      "version does not match Gnus version."))
       ;; Remove old `exist' marks from old nnimap groups.
       (dolist (info (cdr gnus-newsrc-alist))
        (let ((exist (assoc 'unexist (gnus-info-marks info))))