From e4f99feacc910af8c76746a233336889b83cb391 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 1 Sep 1999 23:54:30 +0000 Subject: [PATCH] (smtpmail-send-it): Make directory `smtpmail-queue-dir' if it does not exist; convert filename of queued mail using `convert-standard-filename'. (smtpmail-queue-index): Treat `smtpmail-queue-dir' as a directory name using `file-name-as-directory'. (smtpmail-queue-dir, smtpmail-queue-mail): Remove "*" from doc strings. --- smtpmail.el | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/smtpmail.el b/smtpmail.el index 668721a..4ef7161 100644 --- 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,10 +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 - (concat (time-stamp-yyyy-mm-dd) - "_" (time-stamp-hh:mm:ss)))) + (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)) @@ -242,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) -- 1.7.10.4