Fix starttls-related error message under Windows

* net/network-stream.el (network-stream-open-starttls): Make error
message under Windows be less misleading.

2 files changed, 15 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ac8b4d94b6..488d9d4229f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/network-stream.el (network-stream-open-starttls): Make error
+        message under Windows be less misleading.
+
 2012-03-22  Liang Wang  <netcasper@gmail.com>  (tiny change)
 
         * progmodes/etags.el (etags-list-tags): Only use tags which goto-func
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: