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 8ff78ee5b2e5f94553d7e8d57292b5ea219fbebf..4091d2eb7220900e6d1e57a724e8bd179c59f6a1 100644 (file)
--- 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 33e333d8e8cefb2e887101fbe58bc0d9ef8b3bfe..34d325acf56a526b653b9bbfc42d0023ef12cc4e 100644 (file)
--- 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))