(nntp-open-tls-stream, nntp-open-ssl-stream):

No need to define for compiler.
(url-snews): Use nntp-open-tls-stream unless ssl is requested.

2 files changed, 9 insertions, 5 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 241746162d5..0b8e1a85843 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-02  Glenn Morris  <rgm@gnu.org>
+
+        * url-news.el (nntp-open-tls-stream, nntp-open-ssl-stream):
+        No need to define for compiler.
+        (url-snews): Use nntp-open-tls-stream unless ssl is requested.
+
 2007-11-28  Diane Murray  <disumu@x3y2z1.net>
 
         * url-dired.el: Don't require w3-fetch and w3-open-local.
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index d774270aced..a110a505561 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -31,8 +31,6 @@
 (autoload 'url-warn "url")
 (autoload 'gnus-group-read-ephemeral-group "gnus-group")
 (eval-when-compile (require 'cl))
-(defvar nntp-open-tls-stream)
-(defvar nntp-open-ssl-stream)
 
 (defgroup url-news nil
   "News related options."
@@ -127,9 +125,9 @@
 
 ;;;###autoload
 (defun url-snews (url)
-  (let ((nntp-open-connection-function (if (eq 'tls url-gateway-method)
-                                           nntp-open-tls-stream
-                                         nntp-open-ssl-stream)))
+  (let ((nntp-open-connection-function (if (eq 'ssl url-gateway-method)
+                                           'nntp-open-ssl-stream
+                                         'nntp-open-tls-stream)))
     (url-news url)))
 
 (provide 'url-news)