diff options
| author | Lars Magne Ingebrigtsen | 2013-08-16 17:17:21 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2013-08-16 17:17:21 +0200 |
| commit | 4b5fe4ee092b847504023d3a471e1924c63f0155 (patch) | |
| tree | 43c9c81fb92111eb8a7073967d36210259279568 /lisp | |
| parent | 6146bf5d2f5e1075bde6ee71e44c804fe87ab683 (diff) | |
| download | emacs-4b5fe4ee092b847504023d3a471e1924c63f0155.tar.gz emacs-4b5fe4ee092b847504023d3a471e1924c63f0155.zip | |
* net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
Now that Emacs supports ImageMagick animations.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/shr.el | 1 |
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 @@ | |||
| 1 | 2013-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 | |||
| 1 | 2013-08-16 Michael Albinus <michael.albinus@gmx.de> | 6 | 2013-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. |
| 780 | If FORCE, rescale the image anyway." | 780 | If 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 |