gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and internal images as deletable by `W D D'.

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3f115f1e3c9..ba3f335e381 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 034d65ef1c2..bf9f0cd6b8d 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -150,7 +150,8 @@ fit these criteria."
                 (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 @@ fit these criteria."
               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)