From 0b45b11c9157fc44fecdd1af19e909b340996694 Mon Sep 17 00:00:00 2001 From: David Engster Date: Wed, 10 Jul 2013 21:02:59 +0200 Subject: [PATCH] * 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". --- lisp/ChangeLog | 8 ++++++++ lisp/gnus-start.el | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 02628cadb..e23d55a08 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2013-07-10 David Engster + + * 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 * gnus.el (gnus-summary-line-format): Reference diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 084af8849..94803800e 100644 --- a/lisp/gnus-start.el +++ b/lisp/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)))) -- 2.25.1