[Emacs-diffs] /srv/bzr/emacs/trunk r101379: gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and internal images as deletable by `W D D'.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101379
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-09-07 06:23:16 +0000
message:
  gnus-html.el (gnus-html-wash-tags, gnus-html-put-image): Mark cid and 
internal images as deletable by `W D D'.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-html.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-07 01:20:19 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-07 06:23:16 +0000
@@ -1,5 +1,8 @@
 2010-09-07  Katsumi Yamaoka  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-09-07 00:08:33 +0000
+++ b/lisp/gnus/gnus-html.el    2010-09-07 06:23:16 +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)