Mercurial > emacs
changeset 73627:e7c14a8e6688
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 161-162)
- Update from CVS
2006-11-01 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-art.el (article-hide-boring-headers): Fetch date from
gnus-original-article-buffer to avoid problems with localized date
strings.
2006-10-30 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/html2text.el (html2text-format-tags): Avoid infloop on open tags.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-495
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 02 Nov 2006 23:10:57 +0000 |
| parents | 064fe7ff7747 |
| children | 97c917d6101a |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/html2text.el |
| diffstat | 3 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Nov 02 23:06:20 2006 +0000 +++ b/lisp/gnus/ChangeLog Thu Nov 02 23:10:57 2006 +0000 @@ -1,3 +1,13 @@ +2006-11-01 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus-art.el (article-hide-boring-headers): Fetch date from + gnus-original-article-buffer to avoid problems with localized date + strings. + +2006-10-30 Katsumi Yamaoka <yamaoka@jpl.org> + + * html2text.el (html2text-format-tags): Avoid infloop on open tags. + 2006-10-29 Reiner Steib <Reiner.Steib@gmx.de> * mm-util.el (mm-codepage-iso-8859-list, mm-codepage-ibm-list): New
--- a/lisp/gnus/gnus-art.el Thu Nov 02 23:06:20 2006 +0000 +++ b/lisp/gnus/gnus-art.el Thu Nov 02 23:10:57 2006 +0000 @@ -1917,7 +1917,11 @@ 'string<)))) (gnus-article-hide-header "reply-to"))))) ((eq elem 'date) - (let ((date (message-fetch-field "date"))) + (let ((date (with-current-buffer gnus-original-article-buffer + ;; If date in `gnus-article-buffer' is localized + ;; (`gnus-treat-date-user-defined'), + ;; `days-between' might fail. + (message-fetch-field "date")))) (when (and date (< (days-between (current-time-string) date) 4))
--- a/lisp/gnus/html2text.el Thu Nov 02 23:06:20 2006 +0000 +++ b/lisp/gnus/html2text.el Thu Nov 02 23:10:57 2006 +0000 @@ -423,7 +423,9 @@ (p3) (p4)) (search-backward "<" (point-min) t) (setq p1 (point)) - (re-search-forward (format "</%s>" tag) (point-max) t) + (unless (search-forward (format "</%s>" tag) (point-max) t) + (goto-char p2) + (insert (format "</%s>" tag))) (setq p4 (point)) (search-backward "</" (point-min) t) (setq p3 (point))