Mercurial > emacs
changeset 110755:5c603f558199
Merge changes made in Gnus trunk.
gnus-html.el (gnus-html-put-image): Fix resize image code.
shr.el (shr-ensure-paragraph): Fix the non-empty line case.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 04 Oct 2010 10:16:57 +0000 |
| parents | fa69a70cd62e |
| children | 9070b77b4a28 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-html.el lisp/gnus/shr.el |
| diffstat | 3 files changed, 21 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Oct 04 07:42:58 2010 +0000 +++ b/lisp/gnus/ChangeLog Mon Oct 04 10:16:57 2010 +0000 @@ -1,3 +1,11 @@ +2010-10-04 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * shr.el (shr-ensure-paragraph): Fix the non-empty line case. + +2010-10-04 Julien Danjou <julien@danjou.info> + + * gnus-html.el (gnus-html-put-image): Fix resize image code. + 2010-10-04 Lars Magne Ingebrigtsen <larsi@gnus.org> * shr.el (shr-insert): Use string anchors instead of line anchors.
--- a/lisp/gnus/gnus-html.el Mon Oct 04 07:42:58 2010 +0000 +++ b/lisp/gnus/gnus-html.el Mon Oct 04 10:16:57 2010 +0000 @@ -431,17 +431,19 @@ (= (car size) 30) (= (cdr size) 30)))) ;; Good image, add it! - (let ((image (gnus-html-rescale-image + (let ((image (gnus-rescale-image image - ;; (width . height) - (cons - ;; Aimed width - (truncate - (* gnus-max-image-proportion - (- (nth 2 edges) (nth 0 edges)))) - ;; Aimed height - (truncate (* gnus-max-image-proportion - (- (nth 3 edges) (nth 1 edges)))))))) + (let ((edges (gnus-window-inside-pixel-edges + (get-buffer-window (current-buffer))))) + ;; (width . height) + (cons + ;; Aimed width + (truncate + (* gnus-max-image-proportion + (- (nth 2 edges) (nth 0 edges)))) + ;; Aimed height + (truncate (* gnus-max-image-proportion + (- (nth 3 edges) (nth 1 edges))))))))) (delete-region start end) (gnus-put-image image alt-text 'external) (gnus-put-text-property start (point) 'help-echo alt-text)