diff options
| author | Miles Bader <miles@gnu.org> | 2008-03-29 19:54:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-03-29 19:54:11 +0000 |
| commit | 48ed2a5bec4518503bda8f0cd1b78de1e315f86f (patch) | |
| tree | 3e002af366632a511c061ca36fa4fd06752b921d /lisp/gnus/nntp.el | |
| parent | 9d8f220b390710e6a940d72fe4053f2f1d2ed454 (diff) | |
| download | emacs-48ed2a5bec4518503bda8f0cd1b78de1e315f86f.tar.gz | |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1104
Diffstat (limited to 'lisp/gnus/nntp.el')
| -rw-r--r-- | lisp/gnus/nntp.el | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index f318ee303f0..a1a7e38d240 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1885,7 +1885,10 @@ Please refer to the following variables to customize the connection: - `nntp-end-of-line'." (let ((command `(,nntp-telnet-command ,@nntp-telnet-switches - ,nntp-address ,nntp-port-number)) + ,nntp-address + ,(if (integerp nntp-port-number) + (number-to-string nntp-port-number) + nntp-port-number))) proc) (and nntp-pre-command (push nntp-pre-command command)) @@ -1928,8 +1931,11 @@ Please refer to the following variables to customize the connection: (setq proc (apply 'start-process "nntpd" buffer command)) (with-current-buffer buffer (nntp-wait-for-string "^r?telnet") - (process-send-string proc (concat "open " nntp-address - " " nntp-port-number "\n")) + (process-send-string proc (concat "open " nntp-address " " + (if (integerp nntp-port-number) + (number-to-string nntp-port-number) + nntp-port-number) + "\n")) (nntp-wait-for-string "^\r*20[01]") (beginning-of-line) (delete-region (point-min) (point)) @@ -1970,7 +1976,9 @@ Please refer to the following variables to customize the connection: ,nntp-via-netcat-command ,@nntp-via-netcat-switches ,nntp-address - ,nntp-port-number))) + ,(if (integerp nntp-port-number) + (number-to-string nntp-port-number) + nntp-port-number)))) (apply 'start-process "nntpd" buffer command))) (defun nntp-open-via-telnet-and-telnet (buffer) @@ -2029,7 +2037,9 @@ Please refer to the following variables to customize the connection: ,nntp-telnet-command ,@nntp-telnet-switches ,nntp-address - ,nntp-port-number))) + ,(if (integerp nntp-port-number) + (number-to-string nntp-port-number) + nntp-port-number)))) (process-send-string proc (concat (mapconcat 'identity real-telnet-command " ") |