Commit c0f9edce authored by Gnus developers's avatar Gnus developers Committed by Katsumi Yamaoka
Browse files

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.
parent 146d267b
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
......
......@@ -1062,7 +1062,7 @@ If no one is selected, symmetric encryption will be performed. "
(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 @@ If no one is selected, default secret key is used. "
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)
......
......@@ -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)
......
......@@ -388,6 +388,11 @@ redirects somewhere else."
(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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment