diff options
| author | Lars Magne Ingebrigtsen | 2011-09-03 22:51:26 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2011-09-03 22:51:26 +0000 |
| commit | bc3200871917d5c54c8c4299a06bf8f8ba2ea02d (patch) | |
| tree | 0c117ef685b0872cecd612195952831eb2f65507 | |
| parent | 0f2f6b6d0073d6941e4264e856478d43a3bd4820 (diff) | |
| download | emacs-bc3200871917d5c54c8c4299a06bf8f8ba2ea02d.tar.gz emacs-bc3200871917d5c54c8c4299a06bf8f8ba2ea02d.zip | |
nnimap.el (nnimap-open-connection-1): Use the correct port number in the error message.
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 3 |
2 files changed, 6 insertions, 2 deletions
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 @@ | |||
| 1 | 2011-09-03 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * nnimap.el (nnimap-open-connection-1): Use the correct port number in | ||
| 4 | the error message. | ||
| 5 | |||
| 1 | 2011-09-02 Eli Zaretskii <eliz@gnu.org> | 6 | 2011-09-02 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * message.el (message-setup-1): Return t (Bug#9392). | 8 | * 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.") | |||
| 350 | (with-current-buffer (nnimap-make-process-buffer buffer) | 350 | (with-current-buffer (nnimap-make-process-buffer buffer) |
| 351 | (let* ((coding-system-for-read 'binary) | 351 | (let* ((coding-system-for-read 'binary) |
| 352 | (coding-system-for-write 'binary) | 352 | (coding-system-for-write 'binary) |
| 353 | (port nil) | ||
| 354 | (ports | 353 | (ports |
| 355 | (cond | 354 | (cond |
| 356 | ((memq nnimap-stream '(network plain starttls)) | 355 | ((memq nnimap-stream '(network plain starttls)) |
| @@ -395,7 +394,7 @@ textual parts.") | |||
| 395 | (if (not stream) | 394 | (if (not stream) |
| 396 | (progn | 395 | (progn |
| 397 | (nnheader-report 'nnimap "Unable to contact %s:%s via %s" | 396 | (nnheader-report 'nnimap "Unable to contact %s:%s via %s" |
| 398 | nnimap-address port nnimap-stream) | 397 | nnimap-address (car ports) nnimap-stream) |
| 399 | 'no-connect) | 398 | 'no-connect) |
| 400 | (gnus-set-process-query-on-exit-flag stream nil) | 399 | (gnus-set-process-query-on-exit-flag stream nil) |
| 401 | (if (not (gnus-string-match-p "[*.] \\(OK\\|PREAUTH\\)" greeting)) | 400 | (if (not (gnus-string-match-p "[*.] \\(OK\\|PREAUTH\\)" greeting)) |