diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus-html.el | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index d810df8c7e9..28bbcc341ea 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2010-09-09 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * gnus-html.el (gnus-html-wash-tags): Refactor out the image bit, and + don't restrict end-tag searches to the end of the line. + 2010-09-09 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-start.el (gnus-get-unread-articles): Set the number of unread diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index 03089414e3f..8bfbaaa5279 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -128,11 +128,9 @@ fit these criteria." (while (re-search-forward "<a name[^\n>]+>" nil t) (replace-match "" t t))) -(defun gnus-html-wash-tags () +(defun gnus-html-wash-images () (let (tag parameters string start end images url) - (gnus-html-pre-wash) (goto-char (point-min)) - ;; Search for all the images first. (while (re-search-forward "<img_alt \\([^>]*\\)>" nil t) (setq parameters (match-string 1) @@ -210,6 +208,13 @@ fit these criteria." (set-marker (make-marker) start) (point-marker)) images)))))))) + (when images + (gnus-html-schedule-image-fetching (current-buffer) (nreverse images))))) + +(defun gnus-html-wash-tags () + (let (tag parameters string start end images url) + (gnus-html-pre-wash) + (gnus-html-wash-images) (goto-char (point-min)) ;; Then do the other tags. @@ -220,7 +225,7 @@ fit these criteria." (when (plusp (length parameters)) (set-text-properties 0 (1- (length parameters)) nil parameters)) (delete-region start (point)) - (when (search-forward (concat "</" tag ">") (line-end-position) t) + (when (search-forward (concat "</" tag ">") nil t) (delete-region (match-beginning 0) (match-end 0))) (setq end (point)) (cond @@ -254,8 +259,6 @@ fit these criteria." ;; off any </pre_int>s that were left over. (while (re-search-forward "</pre_int>\\|</internal>" nil t) (replace-match "" t t)) - (when images - (gnus-html-schedule-image-fetching (current-buffer) (nreverse images))) (mm-url-decode-entities))) (defun gnus-html-insert-image () |