(nntp-open-telnet-stream, nntp-open-via-rlogin-and-telnet)

(nntp-open-via-rlogin-and-netcat, nntp-open-via-telnet-and-telnet): Make sure
 the nntp port to specify is a string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3984c8e..9c4511a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nntp.el (nntp-open-telnet-stream, nntp-open-via-rlogin-and-telnet)
+       (nntp-open-via-rlogin-and-netcat, nntp-open-via-telnet-and-telnet):
+       Make sure the nntp port to specify is a string.
+
 2008-03-10  Daiki Ueno  <ueno@unixuser.org>
 
        * mml2015.el (mml2015-epg-passphrase-callback): Type cast KEY-ID to a

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 9b32f7c..68a7f3c 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1886,7 +1886,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))
@@ -1929,8 +1932,11 @@ Please refer to the following variables to customize the connection:
     (save-excursion
       (set-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))
@@ -1971,7 +1977,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)
@@ -2031,7 +2039,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 " ")