(eshell-windows-shell-file): Look for command.com, not command.exe.

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

diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 8dc75608f4daffe95e0773dcbab6cf780a98f506..93a9dd5e504dd2c715e3d9195877a24941540157 100644 (file)
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -1,43 +1,48 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
+
+;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
+;;   2005 Free Software Foundation, Inc.
+
 ;; Keywords: comm, data, processes
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1993 - 1996 by William M. Perry <wmperry@cs.indiana.edu>
-;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
-;;;
-;;; This file is part of GNU Emacs.
-;;;
-;;; 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.
-;;;
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; 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., 59 Temple Place - Suite 330,
-;;; Boston, MA 02111-1307, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This file is part of GNU Emacs.
+
+;; 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.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; 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.
+
+;;; Code:
+
 (require 'url-vars)
 (require 'url-util)
 (require 'url-parse)
 (require 'nntp)
 (autoload 'url-warn "url")
 (autoload 'gnus-group-read-ephemeral-group "gnus-group")
-(eval-when-compile (require 'cl))
+(eval-when-compile
+  (require 'cl)
+  (defvar nntp-open-tls-stream)
+  (defvar nntp-open-ssl-stream))
 
 (defgroup url-news nil
-  "News related options"
+  "News related options."
   :group 'url)
 
 (defun url-news-open-host (host port user pass)
   (if (fboundp 'nnheader-init-server-buffer)
       (nnheader-init-server-buffer))
-  (nntp-open-server host (list (string-to-int port)))
+  (nntp-open-server host (list port))
   (if (and user pass)
       (progn
        (nntp-send-command "^.*\r?\n" "AUTHINFO USER" user)
@@ -73,7 +78,7 @@
                "   </p>\n"
                "   <p>\n"
                "    If you If you feel this is an error, <a href=\""
-               "mailto:" url-bug-address "\">send me mail</a>\n"
+               "mailto:" url-bug-address "\">send mail</a>\n"
                "   </p>\n"
                "  </div>\n"
                " </body>\n"
@@ -89,7 +94,7 @@
   (if (string-match "/+$" newsgroup)
       (setq newsgroup (substring newsgroup 0 (match-beginning 0))))
 
-  ;; This saves us from checking new news if GNUS is already running
+  ;; This saves us from checking new news if Gnus is already running
   ;; FIXME - is it relatively safe to use gnus-alive-p here? FIXME
   (if (or (not (get-buffer gnus-group-buffer))
          (save-excursion
@@ -104,7 +109,7 @@
                                         nntp-open-connection-function)
                                   nil
                                   (cons (current-buffer) 'browse)))
-  
+
 ;;;###autoload
 (defun url-news (url)
   ;; Find a news reference
@@ -126,9 +131,12 @@
 
 ;;;###autoload
 (defun url-snews (url)
-  (let ((nntp-open-connection-function 'nntp-open-ssl-stream))
+  (let ((nntp-open-connection-function (if (eq 'tls url-gateway-method)
+                                          nntp-open-tls-stream
+                                        nntp-open-ssl-stream)))
     (url-news url)))
 
 (provide 'url-news)
 
 ;;; arch-tag: 8975be13-04e8-4d38-bfff-47918e3ad311
+;;; url-news.el ends here