aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2010-09-02 05:03:06 +0000
committerKatsumi Yamaoka2010-09-02 05:03:06 +0000
commitf68a93a990c906234ea0c8d77ca5e785d3e56dfe (patch)
tree188b441d9b5c974d4413c09219e719e0d543b0e3
parent60893e6f01d36a0e4d3c1c584cbae0d26259373a (diff)
downloademacs-f68a93a990c906234ea0c8d77ca5e785d3e56dfe.tar.gz
emacs-f68a93a990c906234ea0c8d77ca5e785d3e56dfe.zip
gnus-html-put-image, gnus-html-rescale-image: Pass `file' argument.
-rw-r--r--lisp/gnus/ChangeLog1
-rw-r--r--lisp/gnus/gnus-html.el4
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4acb6a8a621..e2d34f4c739 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * gnus-html.el (gnus-article-html): Make work buffer multibyte for 3 * gnus-html.el (gnus-article-html): Make work buffer multibyte for
4 decoded contents. 4 decoded contents.
5 (gnus-html-put-image, gnus-html-rescale-image): Pass `file' argument.
5 6
62010-09-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 72010-09-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
7 8
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 80eaae68052..3948598d561 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -255,7 +255,7 @@ fit these criteria."
255 (= (car (image-size image t)) 30) 255 (= (car (image-size image t)) 30)
256 (= (cdr (image-size image t)) 30)))) 256 (= (cdr (image-size image t)) 30))))
257 (progn 257 (progn
258 (gnus-put-image (gnus-html-rescale-image image) 258 (gnus-put-image (gnus-html-rescale-image image file)
259 (gnus-string-or string "*")) 259 (gnus-string-or string "*"))
260 t) 260 t)
261 (insert string) 261 (insert string)
@@ -265,7 +265,7 @@ fit these criteria."
265 (gnus-string-or string "*"))) 265 (gnus-string-or string "*")))
266 nil))))) 266 nil)))))
267 267
268(defun gnus-html-rescale-image (image) 268(defun gnus-html-rescale-image (image file)
269 (if (or (not (fboundp 'imagemagick-types)) 269 (if (or (not (fboundp 'imagemagick-types))
270 (not (get-buffer-window (current-buffer)))) 270 (not (get-buffer-window (current-buffer))))
271 image 271 image