From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sat, 3 Sep 2011 22:51:26 +0000 (+0000)
Subject: nnimap.el (nnimap-open-connection-1): Use the correct port number in the error message.
X-Git-Tag: emacs-pretest-24.0.90~104^2~155^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc3200871917d5c54c8c4299a06bf8f8ba2ea02d;p=emacs.git

nnimap.el (nnimap-open-connection-1): Use the correct port number in the error message.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index db5ee353c3c..ceac837bc55 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnimap.el (nnimap-open-connection-1): Use the correct port number in
+	the error message.
+
 2011-09-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* message.el (message-setup-1): Return t (Bug#9392).
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 2dbc465f8c9..52c4b3c4290 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -350,7 +350,6 @@ textual parts.")
   (with-current-buffer (nnimap-make-process-buffer buffer)
     (let* ((coding-system-for-read 'binary)
 	   (coding-system-for-write 'binary)
-	   (port nil)
 	   (ports
 	    (cond
 	     ((memq nnimap-stream '(network plain starttls))
@@ -395,7 +394,7 @@ textual parts.")
 	(if (not stream)
 	    (progn
 	      (nnheader-report 'nnimap "Unable to contact %s:%s via %s"
-			       nnimap-address port nnimap-stream)
+			       nnimap-address (car ports) nnimap-stream)
 	      'no-connect)
 	  (gnus-set-process-query-on-exit-flag stream nil)
 	  (if (not (gnus-string-match-p "[*.] \\(OK\\|PREAUTH\\)" greeting))