From: Lars Magne Ingebrigtsen Date: Thu, 5 Jan 2012 11:14:10 +0000 (+0000) Subject: starttls.el (starttls-available-p): Return nil on Windows/MS-DOS systems, since these... X-Git-Tag: emacs-pretest-24.0.93~97^2~55^2~35 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f30779d5c435d6c2906dae7b0c2991a52b7db60;p=emacs.git starttls.el (starttls-available-p): Return nil on Windows/MS-DOS systems, since these allegedly don't work there. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 89a16769e2e..446cc4f272e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2012-01-05 Lars Magne Ingebrigtsen + + * starttls.el (starttls-available-p): Return nil on Windows/MS-DOS + systems, since these allegedly don't work there. + 2012-01-04 Chris Gray (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 30a1f172f66..2d403650533 100644 --- 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