# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1283845560 0
# Node ID 63c12314fbd0c2bd6f33fa7411d59da4d5489cc5
# Parent  1e4996f96b0b560f45bb4cfb19710da8803925ef# Parent  97a40b7935bd1c03bca67c44098e770ac3906347
Merge from mainline.

diff -r 1e4996f96b0b -r 63c12314fbd0 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Sep 07 01:25:00 2010 +0000
+++ b/lisp/gnus/ChangeLog	Tue Sep 07 07:46:00 2010 +0000
@@ -1,5 +1,8 @@
 2010-09-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and
+	internal images as deletable by `W D D'.
+
 	* gnus-async.el (gnus-html-prefetch-images): Autoload it when compiling.
 	(gnus-async-article-callback): Fix typo.
 
diff -r 1e4996f96b0b -r 63c12314fbd0 lisp/gnus/gnus-html.el
--- a/lisp/gnus/gnus-html.el	Tue Sep 07 01:25:00 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Tue Sep 07 07:46:00 2010 +0000
@@ -150,7 +150,8 @@
 		(when image
 		  (let ((string (buffer-substring start end)))
 		    (delete-region start end)
-		    (gnus-put-image image (gnus-string-or string "*")))))
+		    (gnus-put-image image (gnus-string-or string "*") 'cid)
+		    (gnus-add-image 'cid image))))
 	    ;; Normal, external URL.
 	    (if (gnus-html-image-url-blocked-p
 		 url
@@ -309,9 +310,11 @@
 	      t)
 	  (insert string)
 	  (when (fboundp 'find-image)
-	    (gnus-put-image (find-image
-			     '((:type xpm :file "lock-broken.xpm")))
-			    (gnus-string-or string "*")))
+	    (setq image (find-image '((:type xpm :file "lock-broken.xpm"))))
+	    (gnus-put-image image
+			    (gnus-string-or string "*")
+			    'internal)
+	    (gnus-add-image 'internal image))
 	  nil)))))
 
 (defun gnus-html-rescale-image (image file size)