[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mail/smtpmail.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mail/smtpmail.el,v |
Date: |
Sat, 23 Feb 2008 19:33:50 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/02/23 19:33:50
Index: smtpmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/smtpmail.el,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- smtpmail.el 14 Feb 2008 18:42:55 -0000 1.100
+++ smtpmail.el 23 Feb 2008 19:33:50 -0000 1.101
@@ -87,32 +87,32 @@
(defcustom smtpmail-default-smtp-server nil
- "*Specify default SMTP server.
+ "Specify default SMTP server.
This only has effect if you specify it before loading the smtpmail library."
:type '(choice (const nil) string)
:group 'smtpmail)
(defcustom smtpmail-smtp-server
(or (getenv "SMTPSERVER") smtpmail-default-smtp-server)
- "*The name of the host running SMTP server."
+ "The name of the host running SMTP server."
:type '(choice (const nil) string)
:group 'smtpmail)
(defcustom smtpmail-smtp-service 25
- "*SMTP service port number.
+ "SMTP service port number.
The default value would be \"smtp\" or 25."
:type '(choice (integer :tag "Port") (string :tag "Service"))
:group 'smtpmail)
(defcustom smtpmail-local-domain nil
- "*Local domain name without a host name.
+ "Local domain name without a host name.
If the function `system-name' returns the full internet address,
don't define this value."
:type '(choice (const nil) string)
:group 'smtpmail)
(defcustom smtpmail-sendto-domain nil
- "*Local domain name without a host name.
+ "Local domain name without a host name.
This is appended (with an @-sign) to any specified recipients which do
not include an @-sign, so that each RCPT TO address is fully qualified.
\(Some configurations of sendmail require this.)
@@ -140,20 +140,22 @@
:type 'boolean
:group 'smtpmail)
-(defcustom smtpmail-code-conv-from nil ;; *junet*
- "*smtpmail code convert from this code to *internal*..for tiny-mime.."
- :type 'boolean
+(defcustom smtpmail-code-conv-from nil
+ "Coding system for encoding outgoing mail.
+Used for the value of `sendmail-coding-system' when
+`select-message-coding-system' is called. "
+ :type 'coding-system
:group 'smtpmail)
(defcustom smtpmail-queue-mail nil
- "*If set, mail is queued; otherwise it is sent immediately.
+ "Non-nil means mail is queued; otherwise it is sent immediately.
If queued, it is stored in the directory `smtpmail-queue-dir'
and sent with `smtpmail-send-queued-mail'."
:type 'boolean
:group 'smtpmail)
(defcustom smtpmail-queue-dir "~/Mail/queued-mail/"
- "*Directory where `smtpmail.el' stores queued mail."
+ "Directory where `smtpmail.el' stores queued mail."
:type 'directory
:group 'smtpmail)
@@ -191,16 +193,21 @@
:group 'smtpmail)
(defcustom smtpmail-warn-about-unknown-extensions nil
- "*If set, print warnings about unknown SMTP extensions.
+ "If set, print warnings about unknown SMTP extensions.
This is mainly useful for development purposes, to learn about
new SMTP extensions that might be useful to support."
:type 'boolean
:version "21.1"
:group 'smtpmail)
-(defvar smtpmail-queue-index-file "index"
+(defcustom smtpmail-queue-index-file "index"
"File name of queued mail index.
-This is relative to `smtpmail-queue-dir'.")
+This is relative to `smtpmail-queue-dir'."
+ :type 'string
+ :group 'smtpmail)
+
+;; End of customizable variables.
+
(defvar smtpmail-address-buffer)
(defvar smtpmail-recipient-address-list)
@@ -210,16 +217,9 @@
;; Buffer-local variable.
(defvar smtpmail-read-point)
-(defvar smtpmail-queue-index (concat smtpmail-queue-dir
- smtpmail-queue-index-file))
-
(defconst smtpmail-auth-supported '(cram-md5 plain login)
"List of supported SMTP AUTH mechanisms.")
-;;;
-;;;
-;;;
-
(defvar smtpmail-mail-address nil
"Value to use for envelope-from address for mail from ambient buffer.")
@@ -409,8 +409,8 @@
(insert (concat file-data "\n"))
(append-to-file (point-min)
(point-max)
- smtpmail-queue-index)
- )
+ (expand-file-name smtpmail-queue-index-file
+ smtpmail-queue-dir)))
(kill-buffer buffer-scratch)
(kill-buffer buffer-data)
(kill-buffer buffer-elisp))))
@@ -425,8 +425,10 @@
(with-temp-buffer
;;; Get index, get first mail, send it, update index, get second
;;; mail, send it, etc...
- (let ((file-msg ""))
- (insert-file-contents smtpmail-queue-index)
+ (let ((file-msg "")
+ (qfile (expand-file-name smtpmail-queue-index-file
+ smtpmail-queue-dir)))
+ (insert-file-contents qfile)
(goto-char (point-min))
(while (not (eobp))
(setq file-msg (buffer-substring (point) (line-end-position)))
@@ -448,7 +450,7 @@
(delete-file file-msg)
(delete-file (concat file-msg ".el"))
(delete-region (point-at-bol) (point-at-bol 2)))
- (write-region (point-min) (point-max) smtpmail-queue-index))))
+ (write-region (point-min) (point-max) qfile))))
;(defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer)