# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1283386102 0
# Node ID 19dfa5177fdd078283e0a15f8bc061b7a61810d5
# Parent  018dd09f6b317034ed8a56cef7355bef5cc6e61f
gnus-html.el: Try to get the rescaling logic right for images that are just wide and not tall.

diff -r 018dd09f6b31 -r 19dfa5177fdd lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Thu Sep 02 00:03:57 2010 +0000
+++ b/lisp/gnus/ChangeLog	Thu Sep 02 00:08:22 2010 +0000
@@ -2,6 +2,8 @@
 
 	* gnus-html.el (gnus-html-put-image): Use the deleted text as the image
 	alt text.
+	(gnus-html-rescale-image): Try to get the rescaling logic right for
+	images that are just wide and not tall.
 
 	* gnus.el (gnus-string-or): Fix the syntax to not use eval or
 	overshadow variable bindings.
diff -r 018dd09f6b31 -r 19dfa5177fdd lisp/gnus/gnus-html.el
--- a/lisp/gnus/gnus-html.el	Thu Sep 02 00:03:57 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Thu Sep 02 00:08:22 2010 +0000
@@ -256,11 +256,14 @@
       (when (> width window-width)
 	(setq window-height (truncate (* window-height
 					 (/ (* 1.0 window-width) width)))))
-      (if (> height window-height)
-	  (or (create-image file 'imagemagick nil
-			    :height window-height)
-	      image)
-	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))))
 
 (defun gnus-html-prune-cache ()
   (let ((total-size 0)