* dgnushack.el: Autoload sha1 on XEmacs.

[gnus] / lisp / gnus-html.el

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index f380d07..6ca3c8b 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -215,16 +215,16 @@ CHARS is a regexp-like character alternative (e.g., \"[)$]\")."
                             (mm-with-part handle (buffer-string))
                             nil t))))
              (if image
-                 (progn
-                   (gnus-put-image
-                    (gnus-rescale-image
-                     image (gnus-html-maximum-image-size))
-                    (gnus-string-or (prog1
-                                        (buffer-substring start end)
-                                      (delete-region start end))
-                                    "*")
-                    'cid)
-                   (gnus-add-image 'cid image))
+                 (gnus-add-image
+                  'cid
+                  (gnus-put-image
+                   (gnus-rescale-image
+                    image (gnus-html-maximum-image-size))
+                   (gnus-string-or (prog1
+                                       (buffer-substring start end)
+                                     (delete-region start end))
+                                   "*")
+                   'cid))
                (widget-convert-button
                 'link start end
                 :action 'gnus-html-insert-image
@@ -482,8 +482,14 @@ Return a string with image data."
                     (gnus-put-text-property start (point)
                                            'gnus-alt-text alt-text)
                     (when url
-                      (gnus-put-text-property start (point)
-                                             'image-url url))
+                     (gnus-add-text-properties
+                      start (point)
+                      `(image-url
+                        ,url
+                        image-displayer
+                        (lambda (url start end)
+                          (gnus-html-display-image url start end
+                                                   ,alt-text)))))
                     (gnus-add-image 'external image)
                     t)
                 ;; Bad image, try to show something else