[Emacs-diffs] /srv/bzr/emacs/trunk r106766: * mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 106766
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2012-01-03 20:41:14 +0100
message:
  * mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-03 06:31:08 +0000
+++ b/lisp/ChangeLog    2012-01-03 19:41:14 +0000
@@ -1,3 +1,7 @@
+2012-01-03  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value.
+
 2012-01-03  Chong Yidong  <address@hidden>
 
        * shell.el (shell-dynamic-complete-functions): Put

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2011-11-20 03:48:53 +0000
+++ b/lisp/mail/smtpmail.el     2012-01-03 19:41:14 +0000
@@ -103,12 +103,14 @@
   "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.