diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-05-14 17:18:18 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-05-14 17:18:18 -0700 |
| commit | 5fe9375a5164960c3ecb65a7ef6d742069b8a7d7 (patch) | |
| tree | 315715009d9fe5af40be38cb0dfccecfaf4c5528 /lisp/mail/smtpmail.el | |
| parent | 0f63e17663f99742425c9ec4f282f5e7e3194b1b (diff) | |
| parent | 02bee7860f7e650ef13e00fe1a7f9a362e3eb001 (diff) | |
| download | emacs-5fe9375a5164960c3ecb65a7ef6d742069b8a7d7.tar.gz emacs-5fe9375a5164960c3ecb65a7ef6d742069b8a7d7.tar.bz2 emacs-5fe9375a5164960c3ecb65a7ef6d742069b8a7d7.zip | |
Merge from origin/emacs-26
02bee78 Let dir locals for more specific modes override those from less
b1235f9 Improve documentation of Hexl mode
32d1813 Fix description of (move-to-column <n> t) when column <n> is ...
0397b7c ; Fix smtpmail-stream-type docstring
7dab3ee Recognize single quote attribute values in nxml and sgml (Bug...
e4cde42 Disable extra display of in nxml-mode (Bug#32897)
ca14dd1 Fix nxml-get-inside (Bug#32003)
e7ab351 Fix positioning client buffer as instructed by emacsclient
# Conflicts:
# lisp/files.el
# lisp/textmodes/sgml-mode.el
Diffstat (limited to 'lisp/mail/smtpmail.el')
| -rw-r--r-- | lisp/mail/smtpmail.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index f31e0b45d20..05ef29a1141 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -101,9 +101,9 @@ don't define this value." (defcustom smtpmail-stream-type nil "Type of SMTP connections to use. -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), or `ssl' (to use TLS/SSL)." +This may be either nil (upgrade with STARTTLS if possible), +`starttls' (refuse to send if STARTTLS isn't available), +`plain' (never use STARTTLS), or `ssl' (to use TLS/SSL)." :version "24.1" :group 'smtpmail :type '(choice (const :tag "Possibly upgrade to STARTTLS" nil) |