[Emacs-diffs] master 0cdd599: nnimap `never' expiration fix

[Lars Ingebrigtsen]

branch: master
commit 0cdd599c54aeda36e7e0696b2f90d2c286153a1d
Author: Elias Oltmanns <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    nnimap `never' expiration fix
    
    * nnimap.el (nnimap-find-expired-articles): Fix handling of
    (expiry-wait . never).
---
 lisp/gnus/ChangeLog |    5 +++++
 lisp/gnus/nnimap.el |   28 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7bf4a6e..49d1444 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-28  Elias Oltmanns  <address@hidden>
+
+       * nnimap.el (nnimap-find-expired-articles): Fix handling of
+       (expiry-wait . never).
+
 2015-01-27  Lars Ingebrigtsen  <address@hidden>
 
        * nnir.el (nnir-imap-expr-to-imap): Check for literal+ capability in
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 8e81abc..ba2013e 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1020,20 +1020,20 @@ textual parts.")
 
 (defun nnimap-find-expired-articles (group)
   (let ((cutoff (nnmail-expired-article-p group nil nil)))
-    (with-current-buffer (nnimap-buffer)
-      (let ((result
-            (nnimap-command
-             "UID SEARCH SENTBEFORE %s"
-             (format-time-string
-              (format "%%d-%s-%%Y"
-                      (upcase
-                       (car (rassoc (nth 4 (decode-time cutoff))
-                                    parse-time-months))))
-              cutoff))))
-       (and (car result)
-            (delete 0 (mapcar #'string-to-number
-                              (cdr (assoc "SEARCH" (cdr result))))))))))
-
+    (when cutoff
+      (with-current-buffer (nnimap-buffer)
+       (let ((result
+              (nnimap-command
+               "UID SEARCH SENTBEFORE %s"
+               (format-time-string
+                (format "%%d-%s-%%Y"
+                        (upcase
+                         (car (rassoc (nth 4 (decode-time cutoff))
+                                      parse-time-months))))
+                cutoff))))
+         (and (car result)
+              (delete 0 (mapcar #'string-to-number
+                                (cdr (assoc "SEARCH" (cdr result)))))))))))
 
 (defun nnimap-find-article-by-message-id (group server message-id
                                                &optional limit)