merge from trunk

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b20f9cc10e..8440647737c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
+        now that Emacs supports ImageMagick animations.
+
 2013-08-16  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-cmds.el (top): Don't declare `buffer-name'.
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 3283712bf0a..9cac618b159 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -779,7 +779,6 @@ element is the data blob and the second element is the content-type."
   "Rescale DATA, if too big, to fit the current buffer.
 If FORCE, rescale the image anyway."
   (if (or (not (fboundp 'imagemagick-types))
-          (eq (image-type-from-data data) 'gif)
           (not (get-buffer-window (current-buffer))))
       (create-image data nil t :ascent 100)
     (let ((edges (window-inside-pixel-edges