From: Lars Magne Ingebrigtsen Date: Fri, 12 Dec 2014 10:48:29 +0000 (+0100) Subject: Remove superfluous `gnutls-available-p' check X-Git-Tag: emacs-25.0.90~2635^2~107 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14efb831885fcdefb199e2ca8d28e73e01f55916;p=emacs.git Remove superfluous `gnutls-available-p' check * lisp/url/url-http.el (url-http-parse-headers): `gnutls-available-p' is now always available. --- diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 8ff78ee5b2e..4091d2eb722 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Lars Magne Ingebrigtsen + + * url-http.el (url-http-parse-headers): `gnutls-available-p' is + now always available. + 2014-12-11 Lars Magne Ingebrigtsen * url-http.el (url-http-parse-headers): Check that diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 33e333d8e8c..34d325acf56 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -495,8 +495,7 @@ should be shown to the user." (url-port url-current-object) url-http-process) ;; Pass the https certificate on to the caller. - (when (and (fboundp 'gnutls-available-p) - (gnutls-available-p)) + (when (gnutls-available-p) (let ((status (gnutls-peer-status url-http-process))) (when (or status (plist-get (car url-callback-arguments) :peer))