aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/shr.el1
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 @@
12013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
4 now that Emacs supports ImageMagick animations.
5
12013-08-16 Michael Albinus <michael.albinus@gmx.de> 62013-08-16 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-cmds.el (top): Don't declare `buffer-name'. 8 * 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."
779 "Rescale DATA, if too big, to fit the current buffer. 779 "Rescale DATA, if too big, to fit the current buffer.
780If FORCE, rescale the image anyway." 780If FORCE, rescale the image anyway."
781 (if (or (not (fboundp 'imagemagick-types)) 781 (if (or (not (fboundp 'imagemagick-types))
782 (eq (image-type-from-data data) 'gif)
783 (not (get-buffer-window (current-buffer)))) 782 (not (get-buffer-window (current-buffer))))
784 (create-image data nil t :ascent 100) 783 (create-image data nil t :ascent 100)
785 (let ((edges (window-inside-pixel-edges 784 (let ((edges (window-inside-pixel-edges