# HG changeset patch
# User Lars Magne Ingebrigtsen <larsi@gnus.org>
# Date 1287092103 -7200
# Node ID a5b0f6d4e94ababa5b10667dd224e160ccec39c2
# Parent  b8fde5ef9e14e9a92becab1e436bcdff1cf29472
* url-gw.el (url-open-stream): Use open-gnutls-stream if it exists.

diff -r b8fde5ef9e14 -r a5b0f6d4e94a lisp/url/ChangeLog
--- a/lisp/url/ChangeLog	Thu Oct 14 16:32:27 2010 +0200
+++ b/lisp/url/ChangeLog	Thu Oct 14 23:35:03 2010 +0200
@@ -1,3 +1,7 @@
+2010-10-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* url-gw.el (url-open-stream): Use open-gnutls-stream if it exists.
+
 2010-10-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* url-http.el (url-http-end-of-document-sentinel): Protect against
diff -r b8fde5ef9e14 -r a5b0f6d4e94a lisp/url/url-gw.el
--- a/lisp/url/url-gw.el	Thu Oct 14 16:32:27 2010 +0200
+++ b/lisp/url/url-gw.el	Thu Oct 14 23:35:03 2010 +0200
@@ -245,7 +245,10 @@
 		(coding-system-for-write 'binary))
 	    (setq conn (case gw-method
 			 (tls
-			  (open-tls-stream name buffer host service))
+			  (funcall (if (fboundp 'open-gnutls-stream)
+				       'open-gnutls-stream
+				     'open-tls-stream)
+				   name buffer host service))
 			 (ssl
 			  (open-ssl-stream name buffer host service))
 			 ((native)