diff options
author | Gnus developers <ding@gnus.org> | 2010-11-17 22:15:24 +0000 |
---|---|---|
committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-11-17 22:15:24 +0000 |
commit | c0f9edcead3abc84d0732d8099dedcfaea89219b (patch) | |
tree | 29443af81e94759d7c58287f1a5d1d031ae01926 /lisp/gnus/nnir.el | |
parent | 146d267b8b8ef2c1823d54eb8a056bb6c443a22d (diff) | |
download | emacs-c0f9edcead3abc84d0732d8099dedcfaea89219b.tar.gz emacs-c0f9edcead3abc84d0732d8099dedcfaea89219b.tar.bz2 emacs-c0f9edcead3abc84d0732d8099dedcfaea89219b.zip |
Merge changes made in Gnus trunk.
nnir.el (nnir-run-imap): Order the article list separately for each group.
shr.el (shr-put-image): Break lines when inserting big pictures.
mml2015.el (mml2015-epg-encrypt): Fix two cons with missing sender.
Diffstat (limited to 'lisp/gnus/nnir.el')
-rw-r--r-- | lisp/gnus/nnir.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 37456774da2..1983a0a5cbd 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -677,14 +677,14 @@ details on the language and supported extensions" (cdr (assoc nnir-imap-default-search-key nnir-imap-search-arguments)))) (gnus-inhibit-demon t) - (groups (or groups (nnir-get-active srv))) - artlist) + (groups (or groups (nnir-get-active srv)))) (message "Opening server %s" server) (apply 'vconcat (mapcar (lambda (x) - (let ((group x)) + (let ((group x) + artlist) (condition-case () (when (nnimap-possibly-change-group (gnus-group-short-name group) server) |