starttls.el (starttls-available-p): Return nil on Windows/MS-DOS systems, since these...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 89a16769e2e74fda3fa2fb9ed813453b722d48a0..446cc4f272ec3ead9da6638debbaf5d9b6842f93 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * starttls.el (starttls-available-p): Return nil on Windows/MS-DOS
+       systems, since these allegedly don't work there.
+
 2012-01-04  Chris Gray  <chrismgray@gmail.com>  (tiny change)
 
        * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a

diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index 30a1f172f66262d26e9a4a052f2a53b5b090d411..2d40365053355a1aede65b63d86a08ce6d1c12c8 100644 (file)
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -297,9 +297,10 @@ GnuTLS requires a port number."
 
 (defun starttls-available-p ()
   "Say whether the STARTTLS programs are available."
-  (executable-find (if starttls-use-gnutls
-                      starttls-gnutls-program
-                    starttls-program)))
+  (and (not (memq system-type '(windows-nt ms-dos)))
+       (executable-find (if starttls-use-gnutls
+                           starttls-gnutls-program
+                         starttls-program))))
 
 (defalias 'starttls-any-program-available 'starttls-available-p)
 (make-obsolete 'starttls-any-program-available 'starttls-available-p