changeset 86935:e31c1cf9dca9

(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.
author Glenn Morris <rgm@gnu.org>
date Sun, 02 Dec 2007 04:03:10 +0000
parents 7130f9859927
children 73d458dd0d7a
files lisp/url/url-news.el
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/url/url-news.el	Sun Dec 02 03:50:19 2007 +0000
+++ b/lisp/url/url-news.el	Sun Dec 02 04:03:10 2007 +0000
@@ -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)