diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /lisp/gnus/starttls.el | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
Merge from trunk.
Diffstat (limited to 'lisp/gnus/starttls.el')
| -rw-r--r-- | lisp/gnus/starttls.el | 17 |
1 files changed, 5 insertions, 12 deletions
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) |