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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c03bb55..d794671 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/nnimap.el b/lisp/nnimap.el
index 2dbc465..52c4b3c 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/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))