Mercurial > emacs

diff lisp/gnus/gnus-html.el @ 110112:8eb5f382b2e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnus-html.el (gnus-html-rescale-image): Yet another try at getting the image sizing right.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 02 Sep 2010 01:46:34 +0000
parents 5b9f64b04a04
children 19ce95f8bbbb
line wrap: on
line diff
--- a/lisp/gnus/gnus-html.el	Thu Sep 02 01:42:32 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Thu Sep 02 01:46:34 2010 +0000
@@ -274,14 +274,16 @@
 	   (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 @@
 	  (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