diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/mail/smtpmail.el | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8679b2c4f5..c852bc00c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-01-03 Lars Magne Ingebrigtsen <[email protected]> + + * mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value. + 2012-01-03 Chong Yidong <[email protected]> * shell.el (shell-dynamic-complete-functions): Put diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index bc38b10124..4946b4e5cd 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -103,12 +103,14 @@ don't define this value." "Connection type SMTP connections. This may be either nil (possibly upgraded to STARTTLS if possible), or `starttls' (refuse to send if STARTTLS isn't -available), or `plain' (never use STARTTLS).." +available), or `plain' (never use STARTTLS), or `ssl' (to use +TLS/SSL)." :version "24.1" :group 'smtpmail :type '(choice (const :tag "Possibly upgrade to STARTTLS" nil) (const :tag "Always use STARTTLS" starttls) - (const :tag "Never use STARTTLS" plain))) + (const :tag "Never use STARTTLS" plain) + (const :tag "Use TLS/SSL" ssl))) (defcustom smtpmail-sendto-domain nil "Local domain name without a host name. |