[Emacs-diffs] /srv/bzr/emacs/trunk r101964: * url-gw.el (url-open-stream): Use open-gnutls-stream if it exists.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 101964
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-14 23:35:03 +0200
message:
  * url-gw.el (url-open-stream): Use open-gnutls-stream if it exists.
modified:
  lisp/url/ChangeLog
  lisp/url/url-gw.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2010-10-07 11:40:42 +0000
+++ b/lisp/url/ChangeLog        2010-10-14 21:35:03 +0000
@@ -1,3 +1,7 @@
+2010-10-14  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * url-gw.el (url-open-stream): Use open-gnutls-stream if it exists.
+
 2010-10-07  Lars Magne Ingebrigtsen  <address@hidden>
 
        * url-http.el (url-http-end-of-document-sentinel): Protect against

=== modified file 'lisp/url/url-gw.el'
--- a/lisp/url/url-gw.el        2010-09-11 01:58:42 +0000
+++ b/lisp/url/url-gw.el        2010-10-14 21:35:03 +0000
@@ -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)