summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/network-stream.el15
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 8730e875ea0..7a3d47ef1d1 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -302,11 +302,16 @@ functionality.
(if (or (null starttls-command)
starttls-available)
"Server does not support TLS"
- (concat "Emacs does not support TLS, and no external `"
- (if starttls-use-gnutls
- starttls-gnutls-program
- starttls-program)
- "' program was found")))
+ ;; See `starttls-available-p'. If this predicate
+ ;; changes to allow running under Windows, the error
+ ;; message below should be amended.
+ (if (memq system-type '(windows-nt ms-dos))
+ (concat "Emacs does not support TLS")
+ (concat "Emacs does not support TLS, and no external `"
+ (if starttls-use-gnutls
+ starttls-gnutls-program
+ starttls-program)
+ "' program was found"))))
(delete-process stream)
(setq stream nil))
;; Return value: