diff options
| author | Miles Bader <miles@gnu.org> | 2006-11-02 23:10:57 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-11-02 23:10:57 +0000 |
| commit | 2b0ea071f458b6154daf18e0c77386831fae76d2 (patch) | |
| tree | 23519af9aa90c9ee30d213784b291db3f9bfa0eb /lisp/gnus | |
| parent | 4b7b04b8e87af74dbb482cd9e5a529cef4f3ba5a (diff) | |
| download | emacs-2b0ea071f458b6154daf18e0c77386831fae76d2.tar.gz | |
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
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/gnus/gnus-art.el | 6 | ||||
| -rw-r--r-- | lisp/gnus/html2text.el | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index fd9de602fb0..87b1d39f2a9 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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 diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index ecee7ff6847..bc7f27c97c8 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1917,7 +1917,11 @@ always hide." '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)) diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el index 68934c909e9..08044225ab4 100644 --- a/lisp/gnus/html2text.el +++ b/lisp/gnus/html2text.el @@ -423,7 +423,9 @@ See the documentation for that variable." (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)) |