Disable starttls.el on Windows and MS-DOS

* starttls.el (starttls-available-p): Return nil on Windows/MS-DOS
systems, since these allegedly don't work there.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 915fe53..a8b340d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/starttls.el b/lisp/starttls.el
index af9fd42..2d40365 100644 (file)
--- a/lisp/starttls.el
+++ b/lisp/starttls.el
@@ -1,6 +1,6 @@
 ;;; starttls.el --- STARTTLS functions
 
-;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Author: Simon Josefsson <simon@josefsson.org>
@@ -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