diff options
| author | Lars Ingebrigtsen | 2012-02-13 03:33:11 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2012-02-13 03:33:11 +0000 |
| commit | 9554f4ac2f4c26420ec71a06e76e8e5ac0d7deda (patch) | |
| tree | 91984cc9d94c3aa4d2b7576bfe433ead3f158809 | |
| parent | 4eff9c1abb072f0769c6b7dcb7233903d6c6e761 (diff) | |
| download | emacs-9554f4ac2f4c26420ec71a06e76e8e5ac0d7deda.tar.gz emacs-9554f4ac2f4c26420ec71a06e76e8e5ac0d7deda.zip | |
shr.el (shr-rescale-image): Allow viewing large images.
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 09861b95606..ebbef064b7b 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-02-13 Lars Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * shr.el (shr-rescale-image): Allow viewing large images. | ||
| 4 | |||
| 1 | 2012-02-12 Lars Ingebrigtsen <larsi@gnus.org> | 5 | 2012-02-12 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 6 | ||
| 3 | * nnml.el (nnml-request-compact-group): Delete the marks file after | 7 | * nnml.el (nnml-request-compact-group): Delete the marks file after |
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index a8bbc77a4b1..a2baa85aeea 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el | |||
| @@ -557,7 +557,8 @@ the URL of the image to the kill buffer instead." | |||
| 557 | (insert alt))) | 557 | (insert alt))) |
| 558 | 558 | ||
| 559 | (defun shr-rescale-image (data) | 559 | (defun shr-rescale-image (data) |
| 560 | (let ((image (create-image data nil t :ascent 100))) | 560 | (let* ((max-image-size 0) |
| 561 | (image (create-image data nil t :ascent 100))) | ||
| 561 | (if (or (not (fboundp 'imagemagick-types)) | 562 | (if (or (not (fboundp 'imagemagick-types)) |
| 562 | (not (get-buffer-window (current-buffer)))) | 563 | (not (get-buffer-window (current-buffer)))) |
| 563 | image | 564 | image |