1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Fix starttls-related error message under Windows

* net/network-stream.el (network-stream-open-starttls): Make error
message under Windows be less misleading.
This commit is contained in:
Lars Magne Ingebrigtsen 2012-03-22 19:42:12 +01:00
parent 126f3d39bb
commit c676576a42
2 changed files with 15 additions and 5 deletions

View file

@ -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: