[Emacs-diffs] /srv/bzr/emacs/trunk r105651: nnimap.el (nnimap-open-connection-1): Use the correct port number in the error message.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105651
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-03 22:51:26 +0000
message:
  nnimap.el (nnimap-open-connection-1): Use the correct port number in the 
error message.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-09-02 17:57:45 +0000
+++ b/lisp/gnus/ChangeLog       2011-09-03 22:51:26 +0000
@@ -1,3 +1,8 @@
+2011-09-03  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * nnimap.el (nnimap-open-connection-1): Use the correct port number in
+       the error message.
+
 2011-09-02  Eli Zaretskii  <address@hidden>
 
        * message.el (message-setup-1): Return t (Bug#9392).

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-08-20 00:20:39 +0000
+++ b/lisp/gnus/nnimap.el       2011-09-03 22:51:26 +0000
@@ -350,7 +350,6 @@
   (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 @@
        (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))