Fix starttls-related error message under Windows

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ac8b4d94b6ca86829a37acbfb5b94a73973c8e5..488d9d4229fafed339a6b457517ce51755806716 100644 (file)
--- 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 8730e875ea00ae7f90ec4075b1e62d1e152154e6..7a3d47ef1d1d07d6d288154cd8cf2b95e00465fa 100644 (file)
--- 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: