From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Wed, 22 Sep 2010 16:26:04 +0000 (+0200)
Subject: Merge branch 'master' of https://git.gnus.org/gnus
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=9ee26ffc92b6bb276f970bae0e66e069227fb286

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

9ee26ffc92b6bb276f970bae0e66e069227fb286
diff --cc lisp/ChangeLog
index 40f08daa7,80cb5f120..bede342b1
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,15 +1,19 @@@
+ 2010-09-22  Julien Danjou  <julien@danjou.info>
+ 
+ 	* gnus-html.el (gnus-html-rescale-image): Use window-inside-pixel-edges
+ 	rather than window-pixel-edges.
+ 	(gnus-html-put-image): Stop using markers. They are harmful if you have
+ 	2 images side-by-side, they can't be properly update on text deletion.
+ 	Using text-property is safer here.
+ 	(gnus-html-image-fetched): Search also for \r\n\r\n to get the start of
+ 	data.
+ 
  2010-09-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +	* nnimap.el (nnimap-expunge-inbox): Removed.
 +	(nnimap-mark-and-expunge-incoming): Use nnimap-expunge instead.
 +	(nnimap-expunge): Flip default to t.
 +
  	* gnus.el (gnus-method-to-server): Don't push things to the cache
  	unless it's unique.
  	(gnus-server-to-method): Ditto.