Mercurial > emacs

changeset 110244:e801f2c8daf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 02 Sep 2010 05:10:45 +0000
parents d0ac153f6acf (current diff) 6b5dc2e2565e (diff)
children db7a9f029b0e
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Thu Sep 02 04:31:05 2010 +0000
+++ b/lisp/gnus/ChangeLog	Thu Sep 02 05:10:45 2010 +0000
@@ -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>
 
--- a/lisp/gnus/gnus-html.el	Thu Sep 02 04:31:05 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Thu Sep 02 05:10:45 2010 +0000
@@ -255,7 +255,7 @@
 			   (= (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 @@
 			    (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