Merge changes made in No Gnus

2012-06-10  Toke Hoiland-Jorgensen <toke@toke.dk> (tiny change)
* nnmaildir.el (nnmaildir-request-expire-articles):
  Ensure that `time' is an integer to avoid later problems.
2012-06-10  Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el: Add a iso-8859-1 cookie to make stuff work under other
 locales.
This commit is contained in:
Gnus developers 2012-06-10 22:16:03 +00:00 committed by Katsumi Yamaoka
parent 166bc0c84e
commit b4543a2894
3 changed files with 15 additions and 1 deletions

View file

@ -1,3 +1,13 @@
2012-06-10 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change)
* nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time'
is an integer to avoid later problems.
2012-06-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el: Add a iso-8859-1 cookie to make stuff work under other
locales.
2012-05-21 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-msg.el (gnus-msg-mail): Ensure that gnus-newsgroup-name is

View file

@ -1461,7 +1461,7 @@ by nnmaildir-request-article.")
(if (eq time 'immediate)
(setq time 0)
(if (numberp time)
(setq time (* time 86400)))))
(setq time (round (* time 86400))))))
(when no-force
(unless (integerp time) ;; handle 'never
(throw 'return (gnus-uncompress-range ranges)))

View file

@ -1393,4 +1393,8 @@ ones, in case fg and bg are nil."
(provide 'shr)
;; Local Variables:
;; coding: iso-8859-1
;; End:
;;; shr.el ends here