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.

3 files changed, 15 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 05eb0dd76c6..9c406f75bf3 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index bbace7c784a..7139a528e11 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -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)))
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index c2040a9b8cf..42118298734 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -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