(Installation): Modify for APEL 9.22; modify location of APEL.

[elisp/flim.git] / smtpmail.el

diff --git a/smtpmail.el b/smtpmail.el
index e5fbe5a..4ef7161 100644 (file)
--- a/smtpmail.el
+++ b/smtpmail.el
@@ -62,14 +62,14 @@
 ;;;
 
 (defcustom smtpmail-queue-mail nil 
-  "*Specify if mail is queued (if t) or sent immediately (if nil).
+  "Specify if mail is queued (if t) or sent immediately (if nil).
 If queued, it is stored in the directory `smtpmail-queue-dir'
 and sent with `smtpmail-send-queued-mail'."
   :type 'boolean
   :group 'smtp)
 
 (defcustom smtpmail-queue-dir "~/Mail/queued-mail/"
-  "*Directory where `smtpmail.el' stores queued mail."
+  "Directory where `smtpmail.el' stores queued mail."
   :type 'directory
   :group 'smtp)
 
@@ -77,8 +77,9 @@ and sent with `smtpmail-send-queued-mail'."
   "File name of queued mail index,
 This is relative to `smtpmail-queue-dir'.")
 
-(defvar smtpmail-queue-index (concat smtpmail-queue-dir
-                                    smtpmail-queue-index-file))
+(defvar smtpmail-queue-index
+  (concat (file-name-as-directory smtpmail-queue-dir)
+         smtpmail-queue-index-file))
 
 (defvar smtpmail-recipient-address-list nil)
 
@@ -230,11 +231,11 @@ This is relative to `smtpmail-queue-dir'.")
                                          tembuf))
                      (error "Sending failed; SMTP protocol error"))
                (error "Sending failed; no recipients"))
-           (let* ((file-data (concat 
-                              smtpmail-queue-dir
-                                  (mapconcat
-                                       (lambda (arg) (format "%x" arg))
-                                       (current-time) "")))
+           (let* ((file-data (convert-standard-filename
+                              (concat
+                               (file-name-as-directory smtpmail-queue-dir)
+                               (concat (time-stamp-yyyy-mm-dd)
+                                       "_" (time-stamp-hh:mm:ss)))))
                   (file-elisp (concat file-data ".el"))
                   (buffer-data (create-file-buffer file-data))
                   (buffer-elisp (create-file-buffer file-elisp))
@@ -243,6 +244,8 @@ This is relative to `smtpmail-queue-dir'.")
                (set-buffer buffer-data)
                (erase-buffer)
                (insert-buffer tembuf)
+               (or (file-directory-p smtpmail-queue-dir)
+                   (make-directory smtpmail-queue-dir t))
                (write-region-as-binary (point-min) (point-max) file-data)
                (set-buffer buffer-elisp)
                (erase-buffer)