From d8826e2643d952363c0ade265f832b579fd1b782 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 15 Feb 2012 09:32:33 +0000
Subject: [PATCH] shr.el (shr-rescale-image): Undo previous change; see
 <http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00540.html>.

---
 lisp/ChangeLog | 5 +++++
 lisp/shr.el    | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fa873400..610eb969a 100644
--- 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 1983c0365..35c7c44df 100644
--- 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
-- 
2.11.4.GIT