summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2010-09-02 05:03:06 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-09-02 05:03:06 +0000
commitf68a93a990c906234ea0c8d77ca5e785d3e56dfe (patch)
tree188b441d9b5c974d4413c09219e719e0d543b0e3 /lisp
parent60893e6f01d36a0e4d3c1c584cbae0d26259373a (diff)
downloademacs-f68a93a990c906234ea0c8d77ca5e785d3e56dfe.tar.gz
emacs-f68a93a990c906234ea0c8d77ca5e785d3e56dfe.tar.bz2
emacs-f68a93a990c906234ea0c8d77ca5e785d3e56dfe.zip
gnus-html-put-image, gnus-html-rescale-image: Pass `file' argument.
Diffstat (limited to 'lisp')
-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 @@
* gnus-html.el (gnus-article-html): Make work buffer multibyte for
decoded contents.
+ (gnus-html-put-image, gnus-html-rescale-image): Pass `file' argument.
2010-09-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
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."
(= (car (image-size image t)) 30)
(= (cdr (image-size image t)) 30))))
(progn
- (gnus-put-image (gnus-html-rescale-image image)
+ (gnus-put-image (gnus-html-rescale-image image file)
(gnus-string-or string "*"))
t)
(insert string)
@@ -265,7 +265,7 @@ fit these criteria."
(gnus-string-or string "*")))
nil)))))
-(defun gnus-html-rescale-image (image)
+(defun gnus-html-rescale-image (image file)
(if (or (not (fboundp 'imagemagick-types))
(not (get-buffer-window (current-buffer))))
image