Commit a93b858c authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

gnus-html.el (gnus-html-wash-tags): Don't show images that are really small. ...

gnus-html.el (gnus-html-wash-tags): Don't show images that are really small.  They're probably tracking images; nntp.el (nntp-request-set-mark): Refuse to do marks if nntp-marks-file-name is nil.
parent 846daf20
2010-09-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-html.el (gnus-html-wash-tags): Don't show images that are really
small. They're probably tracking images.
* nntp.el (nntp-request-set-mark): Refuse to do marks if
nntp-marks-file-name is nil.
2010-09-01 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-html.el (gnus-html-wash-tags)
......
......@@ -94,7 +94,7 @@ fit these criteria."
"-o" "pre_conv=1"
"-t" (format "%s" tab-width)
"-cols" (format "%s" gnus-html-frame-width)
"-o" "display_image=off"
"-o" "display_image=on"
"-T" "text/html"))))
(gnus-html-wash-tags))))
......@@ -142,19 +142,30 @@ fit these criteria."
(with-current-buffer gnus-summary-buffer
gnus-blocked-images)
gnus-blocked-images))
(let ((file (gnus-html-image-id url)))
(if (file-exists-p file)
;; It's already cached, so just insert it.
(let ((string (buffer-substring start end)))
;; Delete the ALT text.
(delete-region start end)
(gnus-html-put-image file (point) string))
;; We don't have it, so schedule it for fetching
;; asynchronously.
(push (list url
(set-marker (make-marker) start)
(point-marker))
images)))))))
(let ((file (gnus-html-image-id url))
width height)
(when (string-match "height=\"?\\([0-9]+\\)" parameters)
(setq height (string-to-number (match-string 1 parameters))))
(when (string-match "width=\"?\\([0-9]+\\)" parameters)
(setq width (string-to-number (match-string 1 parameters))))
;; Don't fetch images that are really small. They're
;; probably tracking pictures.
(when (and (or (null height)
(> height 4))
(or (null width)
(> width 4)))
(if (file-exists-p file)
;; It's already cached, so just insert it.
(let ((string (buffer-substring start end)))
;; Delete the ALT text.
(delete-region start end)
(gnus-html-put-image file (point) string))
;; We don't have it, so schedule it for fetching
;; asynchronously.
(push (list url
(set-marker (make-marker) start)
(point-marker))
images))))))))
;; Add a link.
((or (equal tag "a")
(equal tag "A"))
......
......@@ -1109,7 +1109,8 @@ command whose response triggered the error."
t)
(deffoo nntp-request-set-mark (group actions &optional server)
(unless nntp-marks-is-evil
(when (and (not nntp-marks-is-evil)
nntp-marks-file-name)
(nntp-possibly-create-directory group server)
(nntp-open-marks group server)
(dolist (action actions)
......@@ -1129,7 +1130,8 @@ command whose response triggered the error."
nil)
(deffoo nntp-request-update-info (group info &optional server)
(unless nntp-marks-is-evil
(when (and (not nntp-marks-is-evil)
nntp-marks-file-name)
(nntp-possibly-create-directory group server)
(when (nntp-marks-changed-p group server)
(nnheader-message 8 "Updating marks for %s..." group)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment