2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bef6405d963..6c558723bdf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-08  Glenn Morris  <rgm@gnu.org>
+
+        * mail/smtpmail.el (smtpmail-send-it): Avoid colons in the queued
+        file names, for the sake of MS Windows.  (Bug#7588)
+
 2010-12-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * diff-mode.el (diff-refine-hunk): Make it work when the hunk contains
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 4e76de60188..1bf3fbe4a59 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -379,7 +379,7 @@ The list is in preference order.")
             (let* ((file-data
                     (expand-file-name
                      (format "%s_%i"
-                             (format-time-string "%Y-%m-%d_%H:%M:%S")
+                             (format-time-string "%Y-%m-%d_%H-%M-%S")
                              (setq smtpmail-queue-counter
                                    (1+ smtpmail-queue-counter)))
                      smtpmail-queue-dir))
@@ -1007,5 +1007,4 @@ many continuation lines."
 
 (provide 'smtpmail)
 
-;; arch-tag: a76992df-6d71-43b7-9e72-4bacc6c05466
 ;;; smtpmail.el ends here