diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /lisp/gnus/starttls.el | |
parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) |
Merge from trunk.
Diffstat (limited to 'lisp/gnus/starttls.el')
-rw-r--r-- | lisp/gnus/starttls.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index af9fd42c12..2d40365053 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/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 |