From b7645a9d30f6649b188668b29e0bc10ead071a33 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 2 Feb 2012 22:10:47 +0000 Subject: [PATCH] nnimap.el (nnimap-retrieve-group-data-early): Don't say we're doing an initial sync unless we're really doing one. --- lisp/gnus/ChangeLog | 3 +++ lisp/gnus/nnimap.el | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 793540fd012..10505cd8e48 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,8 @@ 2012-02-02 Lars Ingebrigtsen + * nnimap.el (nnimap-retrieve-group-data-early): Don't say we're doing + an initial sync unless we're really doing one. + * gnus-group.el (gnus-group-read-ephemeral-group): Don't add a new address parameter if one already exists (bug#9676). diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index c3b36709904..a5e82389ab5 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -1244,12 +1244,7 @@ textual parts.") 'qresync nil group 'qresync) sequences) - (let ((start - (if (and active uidvalidity) - ;; Fetch the last 100 flags. - (max 1 (- (cdr active) 100)) - 1)) - (command + (let ((command (if uidvalidity "EXAMINE" ;; If we don't have a UIDVALIDITY, then this is @@ -1257,9 +1252,14 @@ textual parts.") ;; have to do a SELECT (which is slower than an ;; examine), but will tell us whether the group ;; is read-only or not. - "SELECT"))) - (setf (nnimap-initial-resync nnimap-object) - (1+ (nnimap-initial-resync nnimap-object))) + "SELECT")) + start) + (if (and active uidvalidity) + ;; Fetch the last 100 flags. + (setq start (max 1 (- (cdr active) 100))) + (setf (nnimap-initial-resync nnimap-object) + (1+ (nnimap-initial-resync nnimap-object))) + (setq start 1)) (push (list (nnimap-send-command "%s %S" command (utf7-encode group t)) (nnimap-send-command "UID FETCH %d:* FLAGS" start) -- 2.39.2