[Emacs-diffs] master 14efb83: Remove superfluous `gnutls-available-p' check

[Lars Ingebrigtsen]

branch: master
commit 14efb831885fcdefb199e2ca8d28e73e01f55916
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    Remove superfluous `gnutls-available-p' check
    
    * lisp/url/url-http.el (url-http-parse-headers): `gnutls-available-p' is
    now always available.
---
 lisp/url/ChangeLog   |    5 +++++
 lisp/url/url-http.el |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8ff78ee..4091d2e 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-12  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * url-http.el (url-http-parse-headers): `gnutls-available-p' is
+       now always available.
+
 2014-12-11  Lars Magne Ingebrigtsen  <address@hidden>
 
        * url-http.el (url-http-parse-headers): Check that
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 33e333d..34d325a 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))