diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/starttls.el | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b4b28005a87..6b35fbcb8ef 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2011-08-02 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * starttls.el (starttls-available-p): Renamed from + `starttls-any-program-available' and changed return convention. + 2011-07-31 Lars Ingebrigtsen <larsi@gnus.org> * nnmaildir.el (nnmaildir-request-accept-article): Don't call diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index 4b4839a4df2..c1caca90cf0 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) |