Changes committed gnus/lisp (ChangeLog nntp.el)

Modified: ChangeLog 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.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1787 gnus/lisp/ChangeLog:7.1788
--- ChangeLog:7.1787	Mon Mar 10 09:59:45 2008
+++ ChangeLog	Wed Mar 12 02:27:58 2008
@@ -1,3 +1,9 @@
+2008-03-12  Katsumi Yamaoka  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* mml2015.el (mml2015-epg-passphrase-callback): Type cast KEY-ID to a
Index: nntp.el
diff -u gnus/lisp/nntp.el:7.45 gnus/lisp/nntp.el:7.46
--- nntp.el:7.45	Sun Jan 20 06:23:57 2008
+++ nntp.el	Wed Mar 12 02:27:58 2008
@@ -1886,7 +1886,10 @@
 - `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 @@
     (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 @@
 		   ,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 @@
 				     ,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 " ")