[Emacs-diffs] /srv/bzr/emacs/trunk r107068: nnimap.el (nnimap-retrieve-group-data-early): Don't say we're doing an initial sync unless we're really doing one.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107068
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-02-02 22:10:47 +0000
message:
  nnimap.el (nnimap-retrieve-group-data-early): Don't say we're doing an 
initial sync unless we're really doing one.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-02 11:07:55 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-02 22:10:47 +0000
@@ -1,5 +1,8 @@
 2012-02-02  Lars Ingebrigtsen  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2012-02-01 22:06:29 +0000
+++ b/lisp/gnus/nnimap.el       2012-02-02 22:10:47 +0000
@@ -1244,12 +1244,7 @@
                     '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 @@
                     ;; 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)