(nnimap-request-head): Protect against not finding the article by Message-ID.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42c85c9..06730f4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-30  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-request-head): Protect against not finding the
+       article by Message-ID.
+
 2011-01-29  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-art.el (article-update-date-lapsed): Try a better way to really

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 6f73830..04e4bd6 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -519,15 +519,17 @@ textual parts.")
     (with-current-buffer (nnimap-buffer)
       (when (stringp article)
        (setq article (nnimap-find-article-by-message-id group article)))
-      (nnimap-get-whole-article
-       article (format "UID FETCH %%d %s"
-                      (nnimap-header-parameters)))
-      (let ((buffer (current-buffer)))
-       (with-current-buffer (or to-buffer nntp-server-buffer)
-         (erase-buffer)
-         (insert-buffer-substring buffer)
-         (nnheader-ms-strip-cr)
-         (cons group article))))))
+      (if (null article)
+         nil
+       (nnimap-get-whole-article
+        article (format "UID FETCH %%d %s"
+                        (nnimap-header-parameters)))
+       (let ((buffer (current-buffer)))
+         (with-current-buffer (or to-buffer nntp-server-buffer)
+           (erase-buffer)
+           (insert-buffer-substring buffer)
+           (nnheader-ms-strip-cr)
+           (cons group article)))))))
 
 (defun nnimap-get-whole-article (article &optional command)
   (let ((result