diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/gnus/nnmail.el | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a9efd57c5de..bfdda731d35 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,8 @@ 2011-01-30 Lars Ingebrigtsen <larsi@gnus.org> + * nnmail.el (nnmail-article-group): Check for a direct fancy split + method. + * nnimap.el (nnimap-request-head): Protect against not finding the article by Message-ID. diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index f7498cdf159..a41a5d73344 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1148,6 +1148,8 @@ FUNC will be called with the group name to determine the article number." (setq nnmail-split-trace nil)) (if (or (and (symbolp nnmail-split-methods) (fboundp nnmail-split-methods)) + (memq (car-safe nnmail-split-methods) + '(| &)) (and (listp nnmail-split-methods) ;; Not a regular split method, so it has to be a ;; fancy one. |