[Emacs-diffs] /srv/bzr/emacs/trunk r101319: gnus-html.el: Fix up the logic that marks resized images for buffer deletion; Have the image insertion work even if the missing image is in an <a>.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101319
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-04 00:26:18 +0000
message:
  gnus-html.el: Fix up the logic that marks resized images for buffer deletion; 
Have the image insertion work even if the missing image is in an <a>.
modified:
  lisp/gnus/gnus-html.el

=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el    2010-09-04 00:21:34 +0000
+++ b/lisp/gnus/gnus-html.el    2010-09-04 00:26:18 +0000
@@ -161,11 +161,15 @@
                   :help-echo url
                   :keymap gnus-html-image-map
                   :button-keymap gnus-html-image-map)
-                 (gnus-put-text-property
-                  start end
-                  'gnus-image (list url
-                                    (set-marker (make-marker) start)
-                                    (set-marker (make-marker) end))))
+                 (let ((overlay (gnus-make-overlay start end))
+                       (spec (list url
+                                   (set-marker (make-marker) start)
+                                   (set-marker (make-marker) end))))
+                   (gnus-overlay-put overlay 'local-map gnus-html-image-map)
+                   (gnus-overlay-put overlay 'gnus-image spec)
+                   (gnus-put-text-property
+                    start end
+                    'gnus-image spec)))
              (let ((file (gnus-html-image-id url))
                    width height)
                (when (string-match "height=\"?\\([0-9]+\\)" parameters)
@@ -292,7 +296,8 @@
                           (= (car size) 30)
                           (= (cdr size) 30))))
            (progn
-             (gnus-put-image (gnus-html-rescale-image image file size)
+             (setq image (gnus-html-rescale-image image file size))
+             (gnus-put-image image
                              (gnus-string-or string "*")
                              'external)
              (gnus-add-image 'external image)