-(defun starttls-any-program-available ()
- (let ((program (if starttls-use-gnutls
- starttls-gnutls-program
- starttls-program)))
- (condition-case ()
- (progn
- (call-process program)
- program)
- (error (progn
- (message "No STARTTLS program was available (tried '%s')"
- program)
- nil)))))
+(defun starttls-available-p ()
+ "Say whether the STARTTLS programs are available."
+ (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
+ "2011-08-02")