From 77b51da138680394f8cb5cef724e9af0cc78ba3d Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 7 Feb 2011 02:57:26 -0800 Subject: [PATCH] (nnimap-update-info): Fix macrology bug-out. --- lisp/ChangeLog | 1 + lisp/nnimap.el | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a49f3aee4..a6472b0e0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,6 +6,7 @@ (nnimap-quirk): Add quirk for Gmail IMAP which bugs out on NUL characters. (nnimap-process-quirk): Renamed function to avoid collision. + (nnimap-update-info): Fix macrology bug-out. 2011-02-06 Lars Ingebrigtsen diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 4ca7e7fe8..127082bc2 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -1254,28 +1254,28 @@ textual parts.") (when uidnext (setq high (1- uidnext))) ;; First set the active ranges based on high/low. - (gnus-set-active - group - (if (or completep - (not (gnus-active group))) - (cond - (active - (cons (min (or low (car active)) - (car active)) - (max (or high (cdr active)) - (cdr active)))) - ((and low high) - (cons low high)) - (uidnext - ;; No articles in this group. - (cons uidnext (1- uidnext))) - (start-article - (cons start-article (1- start-article))) - (t - ;; No articles and no uidnext. - nil)) - (cons (car active) - (or high (1- uidnext))))) + (if (or completep + (not (gnus-active group))) + (gnus-set-active group + (cond + (active + (cons (min (or low (car active)) + (car active)) + (max (or high (cdr active)) + (cdr active)))) + ((and low high) + (cons low high)) + (uidnext + ;; No articles in this group. + (cons uidnext (1- uidnext))) + (start-article + (cons start-article (1- start-article))) + (t + ;; No articles and no uidnext. + nil))) + (gnus-set-active group + (cons (car active) + (or high (1- uidnext))))) ;; See whether this is a read-only group. (unless (eq permanent-flags 'not-scanned) (gnus-group-set-parameter -- 2.25.1