emacs: lisp/mail/smtpmail.el comparison

comparison lisp/mail/smtpmail.el @ 92129:1f3cc233058d

Remove leading `*' from defcustom doc-strings. (smtpmail-code-conv-from): Doc fix. Fix custom type. (smtpmail-queue-index-file): Make it a defcustom. (smtpmail-queue-index): Delete. (smtpmail-send-it, smtpmail-send-queued-mail): Use smtpmail-queue-index-file and smtpmail-queue-dir rather than smtpmail-queue-index.

author	Glenn Morris <rgm@gnu.org>
date	Sat, 23 Feb 2008 19:33:50 +0000
parents	ee383bc4d019
children	1e3a407766b9

comparison

equal deleted inserted replaced

-:84357f6e06d1
+:1f3cc233058d
 "SMTP protocol for sending mail."
 :group 'mail)
 (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.)
 Don't bother to set this unless you have get an error like:
 "Whether this library sends the SMTP VERB command or not.
 The commands enables verbose information from the SMTP server."
 :type 'boolean
 :group 'smtpmail)
-(defcustom smtpmail-code-conv-from nil ;; *junet*
+(defcustom smtpmail-code-conv-from nil
-"*smtpmail code convert from this code to *internal*..for tiny-mime.."
+"Coding system for encoding outgoing mail.
-:type 'boolean
+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)
 (defcustom smtpmail-auth-credentials "~/.authinfo"
 "Specify username and password for servers, directly or via .netrc file.
 		       (file    :tag "Certificate")))
 :version "21.1"
 :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)
 (defvar smtpmail-queue-counter 0)
 ;; 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.")
 ;;;###autoload
 		(write-file file-elisp)
 		(set-buffer (generate-new-buffer buffer-scratch))
 		(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))))
 (kill-buffer tembuf)
 (if (bufferp errbuf)
 "Send mail that was queued as a result of setting `smtpmail-queue-mail'."
 (interactive)
 (with-temp-buffer
 ;;; Get index, get first mail, send it, update index, get second
 ;;; mail, send it, etc...
-(let ((file-msg ""))
+(let ((file-msg "")
-(insert-file-contents smtpmail-queue-index)
+(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)))
 	(load file-msg)
 	;; Insert the message literally: it is already encoded as per
 (error "Sending failed; SMTP protocol error"))
 (error "Sending failed; no recipients"))))
 	(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)
 (defun smtpmail-fqdn ()
 (if smtpmail-local-domain

Mercurial > emacs

comparison lisp/mail/smtpmail.el @ 92129:1f3cc233058d