Mercurial > emacs
changeset 111584:4273d2312244
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.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 17 Nov 2010 22:15:24 +0000 |
| parents | b59fc34f97fb |
| children | c17f914efec2 |
| files | lisp/gnus/ChangeLog lisp/gnus/mml2015.el lisp/gnus/nnir.el lisp/gnus/shr.el |
| diffstat | 4 files changed, 24 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Nov 17 21:15:24 2010 +0200 +++ b/lisp/gnus/ChangeLog Wed Nov 17 22:15:24 2010 +0000 @@ -1,3 +1,17 @@ +2010-11-17 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * shr.el (shr-put-image): Break lines when inserting big pictures. + +2010-11-17 Daniel Dehennin <daniel.dehennin@baby-gnu.org> + + * mml2015.el (mml2015-epg-encrypt): Fix two cons with missing + sender, thanks Katsumi Yamaoka. + +2010-11-17 Andrew Cohen <cohen@andy.bu.edu> + + * nnir.el (nnir-run-imap): Reverse the article list for each group + rather than the whole list. + 2010-11-17 Katsumi Yamaoka <yamaoka@jpl.org> * shr.el (shr-image-displayer): Protect function against non-existent
--- a/lisp/gnus/mml2015.el Wed Nov 17 21:15:24 2010 +0200 +++ b/lisp/gnus/mml2015.el Wed Nov 17 22:15:24 2010 +0000 @@ -1062,7 +1062,7 @@ (epa-select-keys context "\ Select keys for signing. If no one is selected, default secret key is used. " - (cons mml2015-signers) t) + (cons sender mml2015-signers) t) (if (or sender mml2015-signers) (delq nil (mapcar @@ -1077,7 +1077,7 @@ signer))) (error "No secret key for %s" signer)) signer-key) - (cons mml2015-signers)))))))) + (cons sender mml2015-signers)))))))) (epg-context-set-signers context signers)) (epg-context-set-armor context t) (epg-context-set-textmode context t)
--- a/lisp/gnus/nnir.el Wed Nov 17 21:15:24 2010 +0200 +++ b/lisp/gnus/nnir.el Wed Nov 17 22:15:24 2010 +0000 @@ -677,14 +677,14 @@ (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)
--- a/lisp/gnus/shr.el Wed Nov 17 21:15:24 2010 +0200 +++ b/lisp/gnus/shr.el Wed Nov 17 22:15:24 2010 +0000 @@ -388,6 +388,11 @@ (let ((image (ignore-errors (shr-rescale-image data)))) (when image + ;; When inserting big-ish pictures, put them at the + ;; beginning of the line. + (when (and (> (current-column) 0) + (> (car (image-size image t)) 400)) + (insert "\n")) (insert-image image (or alt "*")))) (insert alt)))