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 | |
| parent | 146d267b8b8ef2c1823d54eb8a056bb6c443a22d (diff) | |
| download | emacs-c0f9edcead3abc84d0732d8099dedcfaea89219b.tar.gz | |
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.
| -rw-r--r-- | lisp/gnus/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/gnus/mml2015.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/nnir.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 5 |
4 files changed, 24 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b509bc39c76..a22314646f4 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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 diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 5a515fa282a..e247abbb476 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -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) 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) diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 526f8121891..b55ee2f431f 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -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))) |