From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Sun, 3 Oct 2010 21:28:53 +0000 (+0200)
Subject: Merge branch 'master' of https://git.gnus.org/gnus
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=b9c7bfb27e9249a6d02db5cabe25709eee795421

Merge branch 'master' of https://git.gnus.org/gnus
---

b9c7bfb27e9249a6d02db5cabe25709eee795421
diff --cc lisp/ChangeLog
index 02c295b75,5076cdb91..08c823529
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,23 +1,26 @@@
+ 2010-10-03  Julien Danjou  <julien@danjou.info>
+ 
+ 	* gnus-html.el (gnus-html-put-image): Use gnus-rescale-image.
+ 
+ 	* mm-view.el (gnus-window-inside-pixel-edges): Add autoload for
+ 	gnus-window-inside-pixel-edges.
+ 
+ 	* gnus-ems.el (gnus-window-inside-pixel-edges): Move from gnus-html to
+ 	gnus-ems.
+ 
+ 	* mm-view.el (mm-inline-image-emacs): Support image resizing.
+ 
+ 	* gnus-util.el (gnus-rescale-image): Add generic gnus-rescale-image
+ 	function.
+ 
+ 	* mm-decode.el (mm-inline-large-images): Enhance defcustom and add
+ 	resize choice.
+ 
  2010-10-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +	* shr.el (shr-tag-p): Don't insert newlines on empty tags at the
 +	beginning of the buffer.
 +
  	* gnus-sum.el (gnus-summary-select-article-buffer): Really select the
  	article buffer again.