merge from no gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f17771..3eee67f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/shr.el b/lisp/shr.el
index 7815845..9a66dd0 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -612,10 +612,9 @@ size, and full-buffer size."
        image)
     (insert alt)))
 
-(defun shr-rescale-image (data &optional force)
-  "Rescale DATA, if too big, to fit the current buffer.
-If FORCE, rescale the image anyway."
-  (let ((image (create-image data nil t :ascent 100)))
+(defun shr-rescale-image (data)
+  (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