Allow gnus-html to register image displayer callbacks.

gnus-html.el (gnus-html-wash-images): Register a displayer.
gnus-util.el (gnus-find-text-property-region): Return markers.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e1265e7cc430261204d9ff283d46431fa63e995a..ddaa22665301decf2767761435825d21a14504af 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2010-11-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-html.el (gnus-html-wash-images): Register a displayer.
+
+       * gnus-util.el (gnus-find-text-property-region): Return markers.
+
        * shr.el (shr-tag-img): Put a displayer in the text property.
 
        * gnus-util.el (gnus-find-text-property-region): New utility function.

diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 8274e20c8c13f36b1bc05e4ca8a89fb7d7805c4e..dc2400c0246f2a622ffa5497bf5c1f80f05cbe43 100644 (file)
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -189,19 +189,26 @@ CHARS is a regexp-like character alternative (e.g., \"[)$]\")."
            (let* ((handle (mm-get-content-id
                             (setq url (match-string 1 url))))
                    (image (when handle
-                            (gnus-create-image (mm-with-part handle (buffer-string))
-                                               nil t))))
+                            (gnus-create-image
+                            (mm-with-part handle (buffer-string))
+                            nil t))))
              (when image
                 (let ((string (buffer-substring start end)))
                   (delete-region start end)
-                  (gnus-put-image (gnus-rescale-image image (gnus-html-maximum-image-size))
+                  (gnus-put-image (gnus-rescale-image
+                                  image (gnus-html-maximum-image-size))
                                   (gnus-string-or string "*") 'cid)
                   (gnus-add-image 'cid image))))
          ;; Normal, external URL.
-          (let ((alt-text (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)"
-                                              parameters)
-                            (xml-substitute-special (match-string 2 parameters)))))
+          (let ((alt-text
+                (when (string-match "\\(alt\\|title\\)=\"\\([^\"]+\\)"
+                                    parameters)
+                  (xml-substitute-special (match-string 2 parameters)))))
             (gnus-put-text-property start end 'image-url url)
+            (gnus-put-text-property
+            start end 'image-displayer
+            (lambda (url start end)
+              (gnus-html-display-image url start end)))
             (if (gnus-html-image-url-blocked-p
                  url
                  (if (buffer-live-p gnus-summary-buffer)

diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 4e4aab43ba2cc3c04914976383af0ef41be21db5..9deedbeb010b4c03396dc526e3a589633a53f2c8 100644 (file)
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -288,7 +288,10 @@ Uses `gnus-extract-address-components'."
       (if (not end)
          (setq start nil)
        (when value
-         (push (list start end value) regions))
+         (push (list (set-marker (make-marker) start)
+                     (set-marker (make-marker) end)
+                     value)
+               regions))
        (setq start (next-single-property-change start prop))))
     (nreverse regions)))