Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4eef78..fb30f69 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-01  Simon Josefsson  <jas@extundo.com>
+
+       * nnimap.el (nnimap-date-days-ago): Defeat locale.
+
 2001-06-28 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mml2015.el (mml2015-format-error): New function.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 82cbe81..912c04e 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1103,10 +1103,12 @@ function is generally only called when Gnus is shutting down."
 
 (defun nnimap-date-days-ago (daysago)
   "Return date, in format \"3-Aug-1998\", for DAYSAGO days ago."
-  (let ((date (format-time-string "%d-%b-%Y"
-                                 (nnimap-time-substract
-                                  (current-time)
-                                  (days-to-time daysago)))))
+  (let* ((time (nnimap-time-substract (current-time) (days-to-time daysago)))
+        (date (format-time-string
+               (format "%%d-%s-%%Y"
+                       (capitalize (car (rassoc (nth 4 (decode-time time))
+                                                parse-time-months))))
+               time)))
     (if (eq ?0 (string-to-char date))
        (substring date 1)
       date)))