Merge remote branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a65e18..3ee368a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -294,6 +294,11 @@
 
 2012-03-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+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
@@ -440,13 +445,6 @@
 
        * gnus-start.el (gnus-1): Avoid duplicate entries.
 
-2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
-
-       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
-       application/octet-stream parts really is.
-
-       * gnus-sum.el (gnus-propagate-marks): Remove.
-
 2012-02-15  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * imap.el: Remove.
@@ -458,6 +456,13 @@
        * gnus-start.el (gnus-clean-old-newsrc): Delete `unexist' from pre-Ma
        Gnus 0.3.
 
+2012-02-16  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-decode.el (mm-dissect-singlepart): Guess what the type of
+       application/octet-stream parts really is.
+
+       * gnus-sum.el (gnus-propagate-marks): Remove.
+
 2012-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * shr.el (shr-rescale-image): Undo previous change; see

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index bbace7c..7139a52 100644 (file)
--- a/lisp/nnmaildir.el
+++ b/lisp/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)))