diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2014-12-12 11:48:29 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2014-12-12 11:48:29 +0100 |
| commit | 14efb831885fcdefb199e2ca8d28e73e01f55916 (patch) | |
| tree | 9665dd5d959a8c2b20d4a827911fbb0dcd03005e | |
| parent | be6dff68be9ad15245896b0b7868369c6e3716ac (diff) | |
| download | emacs-14efb831885fcdefb199e2ca8d28e73e01f55916.tar.gz | |
Remove superfluous `gnutls-available-p' check
* lisp/url/url-http.el (url-http-parse-headers): `gnutls-available-p' is
now always available.
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 3 |
2 files changed, 6 insertions, 2 deletions
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 <larsi@gnus.org> + + * url-http.el (url-http-parse-headers): `gnutls-available-p' is + now always available. + 2014-12-11 Lars Magne Ingebrigtsen <larsi@gnus.org> * 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)) |