[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108034: Merge changes made in No Gnus

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 108034
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-06-10 22:16:03 +0000
message:
  Merge changes made in No Gnus
  
  2012-06-10  Toke Hoiland-Jorgensen <address@hidden> (tiny change)
  * nnmaildir.el (nnmaildir-request-expire-articles):
    Ensure that `time' is an integer to avoid later problems.
  2012-06-10  Lars Magne Ingebrigtsen <address@hidden>
  * shr.el: Add a iso-8859-1 cookie to make stuff work under other
   locales.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnmaildir.el
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-05-21 23:29:03 +0000
+++ b/lisp/gnus/ChangeLog       2012-06-10 22:16:03 +0000
@@ -1,3 +1,13 @@
+2012-06-10  Toke Høiland-Jørgensen  <address@hidden>  (tiny change)
+
+       * nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time'
+       is an integer to avoid later problems.
+
+2012-06-10  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * shr.el: Add a iso-8859-1 cookie to make stuff work under other
+       locales.
+
 2012-05-21  Katsumi Yamaoka  <address@hidden>
 
        * gnus-msg.el (gnus-msg-mail): Ensure that gnus-newsgroup-name is

=== modified file 'lisp/gnus/nnmaildir.el'
--- a/lisp/gnus/nnmaildir.el    2011-08-04 00:58:07 +0000
+++ b/lisp/gnus/nnmaildir.el    2012-06-10 22:16:03 +0000
@@ -1461,7 +1461,7 @@
        (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)))

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2012-03-19 14:44:14 +0000
+++ b/lisp/gnus/shr.el  2012-06-10 22:16:03 +0000
@@ -1393,4 +1393,8 @@
 
 (provide 'shr)
 
+;; Local Variables:
+;; coding: iso-8859-1
+;; End:
+
 ;;; shr.el ends here