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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de13a27..ea25f26 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,11 @@
        * shr.el (shr-remove-trailing-whitespace): Really delete the padding on
        too-wide lines.
 
+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-13  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * nnimap.el (nnimap-record-commands): New variable.

diff --git a/lisp/shr.el b/lisp/shr.el
index f594a60..f3d7503 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -557,8 +557,7 @@ the URL of the image to the kill buffer instead."
     (insert alt)))
 
 (defun shr-rescale-image (data)
-  (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