Merge remote-tracking branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80ec54f..4905dbe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -84,6 +84,9 @@
 
 2012-02-02  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * 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/nnimap.el b/lisp/nnimap.el
index c3b3670..a5e8238 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/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)