From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 13 Feb 2012 03:33:11 +0000 (+0000)
Subject: shr.el (shr-rescale-image): Allow viewing large images.
X-Git-Tag: emacs-pretest-24.0.94~157
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9554f4ac2f4c26420ec71a06e76e8e5ac0d7deda;p=emacs.git

shr.el (shr-rescale-image): Allow viewing large images.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 09861b95606..ebbef064b7b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* shr.el (shr-rescale-image): Allow viewing large images.
+
 2012-02-12  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* nnml.el (nnml-request-compact-group): Delete the marks file after
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index a8bbc77a4b1..a2baa85aeea 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -557,7 +557,8 @@ the URL of the image to the kill buffer instead."
     (insert alt)))
 
 (defun shr-rescale-image (data)
-  (let ((image (create-image data nil t :ascent 100)))
+  (let* ((max-image-size 0)
+	 (image (create-image data nil t :ascent 100)))
     (if (or (not (fboundp 'imagemagick-types))
 	    (not (get-buffer-window (current-buffer))))
 	image