(top-level): Don't require cl when compiling.

(gnus-group-buffer): Define for compiler.
(url-news-fetch-message-id): Don't use `declare'.
(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, 14 insertions, 7 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index f608f54b0e0..61a76ef67d9 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-02  Glenn Morris  <rgm@gnu.org>
+
+        * url-news.el (top-level): Don't require cl when compiling.
+        (gnus-group-buffer): Define for compiler.
+        (url-news-fetch-message-id): Don't use `declare'.
+        (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-12-01  Glenn Morris  <rgm@gnu.org>
 
         * url-handlers.el (top-level): Always require url-parse, not just
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index d774270aced..fc1f0091547 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -30,9 +30,6 @@
 (require 'nntp)
 (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."
@@ -85,8 +82,9 @@
                 )))
     buf))
 
+(defvar gnus-group-buffer)
+
 (defun url-news-fetch-newsgroup (newsgroup host)
-  (declare (special gnus-group-buffer))
   (if (string-match "^/+" newsgroup)
       (setq newsgroup (substring newsgroup (match-end 0))))
   (if (string-match "/+$" newsgroup)
@@ -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)