Commit ae682ff5 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

gnus-html.el (gnus-html-rescale-image): Yet another try at getting the image sizing right.

parent c9fc72fa
......@@ -3,6 +3,8 @@
* gnus-html.el (gnus-html-wash-tags): Don't show images that are really
small. They're probably tracking images.
(gnus-html-wash-tags): Remove all <pre_int> place holders.
(gnus-html-rescale-image): Yet another try at getting the image sizing
right.
* nntp.el (nntp-request-set-mark): Refuse to do marks if
nntp-marks-file-name is nil.
......
......@@ -274,14 +274,16 @@ fit these criteria."
(window-height (truncate (* gnus-max-image-proportion
(- (nth 3 edges) (nth 1 edges)))))
scaled-image)
(or
(cond ((> height window-height)
(create-image file 'imagemagick nil
:height window-height))
((> width window-width)
(create-image file 'imagemagick nil
:width window-width)))
image))))
(when (> height window-height)
(setq image (or (create-image file 'imagemagick nil
:height window-height)
image))
(when (> (car (image-size image t)) window-width)
(setq image (or
(create-image file 'imagemagick nil
:width window-width)
image))))
image)))
(defun gnus-html-prune-cache ()
(let ((total-size 0)
......@@ -301,7 +303,6 @@ fit these criteria."
(decf total-size (cadr file))
(delete-file (nth 2 file)))))))
(defun gnus-html-image-url-blocked-p (url blocked-images)
"Find out if URL is blocked by BLOCKED-IMAGES."
(let ((ret (and blocked-images
......
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