diff options
| author | Gnus developers <ding@gnus.org> | 2012-01-04 22:14:09 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-01-04 22:14:09 +0000 |
| commit | 9937bef4b8f3a820220d0309b340f25285808fae (patch) | |
| tree | c84ab0101d4c13b5187845914217966f39bbca16 /lisp/gnus/nnir.el | |
| parent | a7183d7c4625f88a8754061b02674d718e64f48f (diff) | |
| download | emacs-9937bef4b8f3a820220d0309b340f25285808fae.tar.gz | |
Merge changes made in Gnus trunk.
2012-01-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Group Parameters): Note precedence.
2012-01-04 Chris Gray <chrismgray@gmail.com> (tiny change)
* mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a
live buffer.
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
gnus-agent-article-local on changing method.
2012-01-04 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.el (gnus-parameters): Note precedence.
2012-01-04 Leo <sdl.web@gmail.com>
* nndraft.el (nndraft-update-unread-articles): Don't move point around
in the group buffer.
Diffstat (limited to 'lisp/gnus/nnir.el')
| -rw-r--r-- | lisp/gnus/nnir.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index ceeaeda9309..1d4f1c25a09 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/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) |