mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Merge from gnus--rel--5.10

Browse source 
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
This commit is contained in:
Miles Bader 2006-11-02 23:10:57 +00:00
parent 8917392a52
commit b193caa336
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/gnus/ChangeLog
View file

@ -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

6
lisp/gnus/gnus-art.el
View file

@ -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))

4
lisp/gnus/html2text.el
View file

@ -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))