X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-html.el;h=7e13a0bde979c043dfe8f8eff1cb8b2e9adc5da7;hb=d690c9a0370e1a17632f4934bbfaa06349c701b1;hp=5bbf5d5893b1b4adb04b39cd20e71384fb3f89f9;hpb=a0d8ab30a881364eb0da6f0814f4acddb50e6dd2;p=gnus

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 5bbf5d589..7e13a0bde 100644
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -84,7 +84,7 @@ fit these criteria."
 		       (not (eq charset 'ascii)))
 	      (mm-decode-coding-region (point-min) (point-max) charset))
 	    (call-process-region (point-min) (point-max)
-				 "w3m" 
+				 "w3m"
 				 nil article-buffer nil
 				 "-halfdump"
 				 "-no-cookie"
@@ -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
@@ -328,7 +329,7 @@ fit these criteria."
                 (push (gnus-html-image-id url) urls)
                 (push "-o" urls)))))
 	(let ((process
-	       (apply 'start-process 
+	       (apply 'start-process
 		      "images" nil "curl"
 		      "-s" "--create-dirs"
 		      "--location"