[Emacs-diffs] Changes to emacs/lisp/gnus/nntp.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/03/29 19:54:11

Index: lisp/gnus/nntp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/nntp.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- lisp/gnus/nntp.el   12 Mar 2008 19:56:09 -0000      1.40
+++ lisp/gnus/nntp.el   29 Mar 2008 19:54:09 -0000      1.41
@@ -1885,7 +1885,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))
@@ -1928,8 +1931,11 @@
     (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 @@
                   ,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 @@
                                     ,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 " ")