(smtpmail-send-it): Don't use : in filenames

(for cygwin). Suggested by Andrew Senior <aws@watson.ibm.com>.
Use expand-file-name.  Also don't require time-stamp.

1 files changed, 9 insertions, 9 deletions

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 9984a873ffa..78393348c5d 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -66,7 +66,6 @@
 ;;; Code:
 
 (require 'sendmail)
-(require 'time-stamp)
 (autoload 'starttls-open-stream "starttls")
 (autoload 'starttls-negotiate "starttls")
 (autoload 'mail-strip-quoted-names "mail-utils")
@@ -343,14 +342,15 @@ This is relative to `smtpmail-queue-dir'.")
                             smtpmail-recipient-address-list tembuf))
                       (error "Sending failed; SMTP protocol error"))
                 (error "Sending failed; no recipients"))
-            (let* ((file-data (concat
-                               smtpmail-queue-dir
-                               (concat (time-stamp-yyyy-mm-dd)
-                                       "_" (time-stamp-hh:mm:ss)
-                                       "_"
-                                       (setq smtpmail-queue-counter
-                                             (1+ smtpmail-queue-counter)))))
-                      (file-elisp (concat file-data ".el"))
+            (let* ((file-data
+                    (expand-file-name
+                     (format "%s_%i"
+                             (format-time-string "%Y-%m-%d_%H:%M:%S")
+                             (setq smtpmail-queue-counter
+                                   (1+ smtpmail-queue-counter)))
+                     smtpmail-queue-dir))
+                   (file-data (convert-standard-filename file-data))
+                   (file-elisp (concat file-data ".el"))
                    (buffer-data (create-file-buffer file-data))
                    (buffer-elisp (create-file-buffer file-elisp))
                    (buffer-scratch "*queue-mail*"))