summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2012-02-13 03:33:11 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-02-13 03:33:11 +0000
commit9554f4ac2f4c26420ec71a06e76e8e5ac0d7deda (patch)
tree91984cc9d94c3aa4d2b7576bfe433ead3f158809 /lisp/gnus
parent4eff9c1abb072f0769c6b7dcb7233903d6c6e761 (diff)
downloademacs-9554f4ac2f4c26420ec71a06e76e8e5ac0d7deda.tar.gz
shr.el (shr-rescale-image): Allow viewing large images.
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/gnus/shr.el3
2 files changed, 6 insertions, 1 deletions
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