From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Thu, 22 Mar 2012 18:42:12 +0000 (+0100)
Subject: Fix starttls-related error message under Windows
X-Git-Tag: emacs-pretest-24.0.05~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c676576a42ae6f2593948ae5786a01cad71e9bf5;p=emacs.git

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