From 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 2 Aug 2011 22:05:38 -0700 Subject: Merge from trunk. --- lisp/gnus/starttls.el | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'lisp/gnus/starttls.el') diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index 4b4839a4df..c1caca90cf 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -295,18 +295,11 @@ GNUTLS requires a port number." (starttls-set-process-query-on-exit-flag process nil) process))) -(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." + (executable-find (if starttls-use-gnutls + starttls-gnutls-program + starttls-program))) (provide 'starttls) -- cgit v1.2.3