diff options
| author | Joakim Verona <joakim@verona.se> | 2012-03-25 22:04:52 +0200 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2012-03-25 22:04:52 +0200 |
| commit | 75da28a3845b9dfa4e730cfa19c14edc52cbb222 (patch) | |
| tree | b04519bffcb21264cbe3ce8af13df7186548667f /lisp/net/network-stream.el | |
| parent | b827329a89291ed68dd017c53976be7ce5ed3b22 (diff) | |
| parent | f514f6f0e3f8bbeb5212d0337e5bda5a9a4eaeb5 (diff) | |
| download | emacs-75da28a3845b9dfa4e730cfa19c14edc52cbb222.tar.gz emacs-75da28a3845b9dfa4e730cfa19c14edc52cbb222.tar.bz2 emacs-75da28a3845b9dfa4e730cfa19c14edc52cbb222.zip | |
upstream
Diffstat (limited to 'lisp/net/network-stream.el')
| -rw-r--r-- | lisp/net/network-stream.el | 15 |
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: |