Synch to No Gnus 200404120904.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb1e0d7..55ab168 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2004-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * nntp.el (nntp-netcat-command): New variable.
-       (nntp-netcat-switches): New variable.
+       * nntp.el (nntp-via-netcat-command): New variable.
+       (nntp-via-netcat-switches): New variable.
        (nntp-open-via-rlogin-and-netcat): New function.
        (nntp-open-connection-function): Doc fix.
        (nntp-telnet-command): Doc fix.

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 94fe885..cab628e 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -125,21 +125,11 @@ This is where you would put \"runsocks\" or stuff like that.")
 (defvoo nntp-telnet-command "telnet"
   "*Telnet command used to connect to the nntp server.
 This command is used by the methods `nntp-open-telnet-stream',
-`nntp-open-via-rlogin-and-telnet' and `nntp-open-via-telnet-and-telnet'.
-
-See `nntp-netcat-command' for the `nntp-open-via-rlogin-and-netcat'
-method.")
+`nntp-open-via-rlogin-and-telnet' and `nntp-open-via-telnet-and-telnet'.")
 
 (defvoo nntp-telnet-switches '("-8")
   "*Switches given to the telnet command `nntp-telnet-command'.")
 
-(defvoo nntp-netcat-command "nc"
-  "*Netcat command used to connect to the nntp server.
-This command is used by the `nntp-open-via-rlogin-and-netcat' method.")
-
-(defvoo nntp-netcat-switches nil
-  "*Switches given to the netcat command `nntp-netcat-command'.")
-
 (defvoo nntp-end-of-line "\r\n"
   "*String to use on the end of lines when talking to the NNTP server.
 This is \"\\r\\n\" by default, but should be \"\\n\" when using and
@@ -165,6 +155,13 @@ This command is used by the `nntp-open-via-telnet-and-telnet' method.")
 (defvoo nntp-via-telnet-switches '("-8")
   "*Switches given to the telnet command `nntp-via-telnet-command'.")
 
+(defvoo nntp-via-netcat-command "nc"
+  "*Netcat command used to connect to the nntp server.
+This command is used by the `nntp-open-via-rlogin-and-netcat' method.")
+
+(defvoo nntp-via-netcat-switches nil
+  "*Switches given to the netcat command `nntp-via-netcat-command'.")
+
 (defvoo nntp-via-user-name nil
   "*User name to log in on an intermediate host with.
 This variable is used by the various nntp-open-via-* methods.")
@@ -1885,8 +1882,8 @@ Please refer to the following variables to customize the connection:
 - `nntp-via-rlogin-command-switches',
 - `nntp-via-user-name',
 - `nntp-via-address',
-- `nntp-netcat-command',
-- `nntp-netcat-switches',
+- `nntp-via-netcat-command',
+- `nntp-via-netcat-switches',
 - `nntp-address',
 - `nntp-port-number',
 - `nntp-end-of-line'."
@@ -1898,8 +1895,8 @@ Please refer to the following variables to customize the connection:
                   ,@(when nntp-via-user-name
                       (list "-l" nntp-via-user-name))
                   ,nntp-via-address
-                  ,nntp-netcat-command
-                  ,@nntp-netcat-switches
+                  ,nntp-via-netcat-command
+                  ,@nntp-via-netcat-switches
                   ,nntp-address
                   ,nntp-port-number)))
     (apply 'start-process "nntpd" buffer command)))