[Emacs-diffs] master c6f03ed: Fix a problem in url.el without GnuTLS

[Lars Ingebrigtsen]

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

    Fix a problem in url.el without GnuTLS
    
    Fixes: debbugs:19346
    
    * lisp/url/url-http.el (url-http-parse-headers): Check that
    `gnutls-available-p' is defined.
---
 lisp/url/ChangeLog   |    5 +++++
 lisp/url/url-http.el |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 690f699..8ff78ee 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-11  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * url-http.el (url-http-parse-headers): Check that
+       `gnutls-available-p' is defined (bug#19346).
+
 2014-12-09  Lars Magne Ingebrigtsen  <address@hidden>
 
        * url-http.el (url-http-parse-headers): Pass the GnuTLS status of
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 34d325a..33e333d 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -495,7 +495,8 @@ should be shown to the user."
                                    (url-port url-current-object)
                                    url-http-process)
   ;; Pass the https certificate on to the caller.
-  (when (gnutls-available-p)
+  (when (and (fboundp 'gnutls-available-p)
+            (gnutls-available-p))
     (let ((status (gnutls-peer-status url-http-process)))
       (when (or status
                (plist-get (car url-callback-arguments) :peer))