shr.el (shr-rescale-image): Undo previous change; see <http://lists.gnu.org/archive...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fa8734..610eb96 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,11 @@
        * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
        Gnus 0.3.
 
+2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * shr.el (shr-rescale-image): Undo previous change; see
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.
+
 2012-02-15  Lars Magne Ingebrigtsen  <lars@ingebrigtsen.no>
 
        * gnus.el: Ma Gnus v0.3 is released.

diff --git a/lisp/shr.el b/lisp/shr.el
index 1983c03..35c7c44 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -615,8 +615,7 @@ size, and full-buffer size."
 (defun shr-rescale-image (data &optional force)
   "Rescale DATA, if too big, to fit the current buffer.
 If FORCE, rescale the image anyway."
-  (let* ((max-image-size nil)
-        (image (create-image data nil t :ascent 100)))
+  (let ((image (create-image data nil t :ascent 100)))
     (if (or (not (fboundp 'imagemagick-types))
            (not (get-buffer-window (current-buffer))))
        image