[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104181: shr.el (shr-put-image-functi
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104181: shr.el (shr-put-image-function): New variable. |
Date: |
Tue, 10 May 2011 03:14:44 +0000 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104181
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-10 03:14:44 +0000
message:
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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-art.el
lisp/gnus/gnus-html.el
lisp/gnus/shr.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-05-09 22:27:17 +0000
+++ b/lisp/gnus/ChangeLog 2011-05-10 03:14:44 +0000
@@ -1,3 +1,15 @@
+2011-05-10 Katsumi Yamaoka <address@hidden>
+
+ * 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.
+
2011-05-09 Stefan Monnier <address@hidden>
* nntp.el (nntp-open-connection): Set TCP keepalive option.
=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el 2011-05-02 22:41:38 +0000
+++ b/lisp/gnus/gnus-art.el 2011-05-10 03:14:44 +0000
@@ -4656,6 +4656,8 @@
(gnus-run-hooks 'gnus-article-prepare-hook)
t))))))
+(defvar shr-put-image-function)
+
;;;###autoload
(defun gnus-article-prepare-display ()
"Make the current buffer look like a nice article."
@@ -4669,6 +4671,7 @@
(setq buffer-read-only nil
gnus-article-wash-types nil
gnus-article-image-alist nil)
+ (set (make-local-variable 'shr-put-image-function) 'gnus-shr-put-image)
(gnus-run-hooks 'gnus-tmp-internal-hook)
(when gnus-display-mime-function
(funcall gnus-display-mime-function))))
@@ -6139,6 +6142,15 @@
(not gnus-inhibit-hiding))
(gnus-article-hide-headers)))
+(declare-function shr-put-image "shr" (data alt))
+
+(defun gnus-shr-put-image (data alt)
+ "Put image DATA with a string ALT. Enable image to be deleted."
+ (let ((image (shr-put-image data (propertize (or alt "*")
+ 'gnus-image-category 'shr))))
+ (when image
+ (gnus-add-image 'shr image))))
+
;;; Article savers.
(defun gnus-output-to-file (file-name)
=== modified file 'lisp/gnus/gnus-html.el'
--- a/lisp/gnus/gnus-html.el 2011-05-02 22:41:38 +0000
+++ b/lisp/gnus/gnus-html.el 2011-05-10 03:14:44 +0000
@@ -215,16 +215,16 @@
(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
=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el 2011-05-07 10:41:20 +0000
+++ b/lisp/gnus/shr.el 2011-05-10 03:14:44 +0000
@@ -87,6 +87,9 @@
This is used for cid: URLs, and the function is called with the
cid: URL as the argument.")
+(defvar shr-put-image-function 'shr-put-image
+ "Function called to put image and alt string.")
+
(defface shr-strike-through '((t (:strike-through t)))
"Font for <s> elements."
:group 'shr)
@@ -500,10 +503,11 @@
(inhibit-read-only t))
(delete-region start end)
(goto-char start)
- (shr-put-image data alt)))))))
+ (funcall shr-put-image-function data alt)))))))
(kill-buffer (current-buffer)))
(defun shr-put-image (data alt)
+ "Put image DATA with a string ALT. Return image."
(if (display-graphic-p)
(let ((image (ignore-errors
(shr-rescale-image data))))
@@ -513,7 +517,8 @@
(when (and (> (current-column) 0)
(> (car (image-size image t)) 400))
(insert "\n"))
- (insert-image image (or alt "*"))))
+ (insert-image image (or alt "*")))
+ image)
(insert alt)))
(defun shr-rescale-image (data)
@@ -576,8 +581,8 @@
(substring url (match-end 0)))))
(when image
(goto-char start)
- (shr-put-image image
- (buffer-substring-no-properties start end))
+ (funcall shr-put-image-function
+ image (buffer-substring-no-properties start end))
(delete-region (point) end))))
(url-retrieve url 'shr-image-fetched
(list (current-buffer) start end)
@@ -864,7 +869,7 @@
(if (or (not shr-content-function)
(not (setq image (funcall shr-content-function url))))
(insert alt)
- (shr-put-image image alt))))
+ (funcall shr-put-image-function image alt))))
((or shr-inhibit-images
(and shr-blocked-images
(string-match shr-blocked-images url)))
@@ -874,7 +879,7 @@
(shr-insert (truncate-string-to-width alt 8))
(shr-insert alt))))
((url-is-cached (shr-encode-url url))
- (shr-put-image (shr-get-image-data url) alt))
+ (funcall shr-put-image-function (shr-get-image-data url) alt))
(t
(insert alt)
(funcall
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104181: shr.el (shr-put-image-function): New variable.,
Katsumi Yamaoka <=