Add 2010 to copyright years.

[gnu-emacs] / lisp / url / url-news.el

diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index ab3c3ae31adff4d1e2612970a32e1c0518e416ad..dcbc6d671f399a765944d80a8e08fd7ee5a27307 100644 (file)
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -1,16 +1,16 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Code:
 
@@ -30,9 +28,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 +80,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)
@@ -102,8 +98,8 @@
   (goto-char (point-min))
   (gnus-group-read-ephemeral-group newsgroup
                                   (list 'nntp host
-                                        'nntp-open-connection-function
-                                        nntp-open-connection-function)
+                                        (list 'nntp-open-connection-function
+                                              nntp-open-connection-function))
                                   nil
                                   (cons (current-buffer) 'browse)))
 
@@ -127,9 +123,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)