(nnir-retrieve-headers): Protect against the article not existing on the server

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5957ef2..9653b18 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnir.el (nnir-retrieve-headers): Protect against the article not
+       existing on the server (bug#10335).
+
 2012-01-04  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
 
        * gnus-agent.el (gnus-agent-load-local): Recompute

diff --git a/lisp/nnir.el b/lisp/nnir.el
index ceeaeda..1d4f1c2 100644 (file)
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -1,6 +1,6 @@
 ;;; nnir.el --- search mail with various search engines -*- coding: iso-8859-1 -*-
 
-;; Copyright (C) 1998-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2012 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de>
 ;; Swish-e and Swish++ backends by:
@@ -670,7 +670,8 @@ Add an entry here when adding a new search engine.")
          (goto-char (point-min))
          (while (not (eobp))
            (let* ((novitem (funcall parsefunc))
-                  (artno (mail-header-number novitem))
+                  (artno (and novitem
+                              (mail-header-number novitem)))
                   (art (car (rassq artno articleids))))
              (when art
                (mail-header-set-number novitem art)