mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge changes made in Gnus trunk.

Browse source 
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.
This commit is contained in:
Gnus developers 2010-11-17 22:15:24 +00:00 • committed by Katsumi Yamaoka
parent 146d267b8b
commit c0f9edcead
4 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/gnus/shr.el
View file

@ -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)))