summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-html.el
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2011-05-10 03:14:44 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-05-10 03:14:44 +0000
commitb9bdaf749fb16229ef78c71a8cba2d4c37f4a6d9 (patch)
tree82c45ae18ed7ec54d0560f99c8d5ee2849453283 /lisp/gnus/gnus-html.el
parentb8f82dc15fc7370329930323082d9faf2a5fc7ad (diff)
downloademacs-b9bdaf749fb16229ef78c71a8cba2d4c37f4a6d9.tar.gz
shr.el (shr-put-image-function): New variable.
(shr-image-fetched, shr-image-displayer, shr-tag-img): Funcall it. (shr-put-image): Return scaled image. gnus-art.el (gnus-shr-put-image): New function. (gnus-article-prepare-display): Bind shr-put-image-function to it. gnus-html.el (gnus-html-wash-images): Register scaled images, not original ones, as deletable.
Diffstat (limited to 'lisp/gnus/gnus-html.el')
-rw-r--r--lisp/gnus/gnus-html.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index f380d079d7b..b7f0c0922a3 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/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