From 228724bc63cfb48f0fbdd08ecddd7100974d6c11 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sun, 30 Jan 2011 01:46:32 +0000 Subject: [PATCH] nnimap.el (nnimap-request-head): Protect against not finding the article by Message-ID. --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nnimap.el | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 40aa931e62f..a9efd57c5de 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2011-01-30 Lars Ingebrigtsen + + * nnimap.el (nnimap-request-head): Protect against not finding the + article by Message-ID. + 2011-01-29 Lars Ingebrigtsen * gnus-art.el (article-update-date-lapsed): Try a better way to really diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 6f7383062db..04e4bd6c9a2 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/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 -- 2.11.4.GIT