diff options
| author | Lars Ingebrigtsen | 2012-02-09 06:05:43 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2012-02-09 06:05:43 +0000 |
| commit | 65e6fb28e0861267461c39bae222e731c0840f8b (patch) | |
| tree | 59169a345273ad0cd567cacb8ad2eb1e19924e5e | |
| parent | 001bf877d084f3fe00a0db77eb4db26d8044de86 (diff) | |
| download | emacs-65e6fb28e0861267461c39bae222e731c0840f8b.tar.gz emacs-65e6fb28e0861267461c39bae222e731c0840f8b.zip | |
nnimap.el (nnimap-wait-for-response): Minor fixup of message string.
| -rw-r--r-- | lisp/gnus/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9cd6879988b..6ce85227e0b 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-02-09 Lars Ingebrigtsen <larsi@gnus.org> | 1 | 2012-02-09 Lars Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * nnimap.el (nnimap-wait-for-response): Minor fixup of message string. | ||
| 4 | |||
| 3 | * gnus.el (gnus-server-extend-method): Don't add an -address component | 5 | * gnus.el (gnus-server-extend-method): Don't add an -address component |
| 4 | if the method already has one (bug#9676). | 6 | if the method already has one (bug#9676). |
| 5 | 7 | ||
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 4c75f721ff6..de4d248c624 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el | |||
| @@ -1754,8 +1754,11 @@ textual parts.") | |||
| 1754 | 7 "nnimap read %dk from %s%s" (/ (buffer-size) 1000) | 1754 | 7 "nnimap read %dk from %s%s" (/ (buffer-size) 1000) |
| 1755 | nnimap-address | 1755 | nnimap-address |
| 1756 | (if (not (zerop (nnimap-initial-resync nnimap-object))) | 1756 | (if (not (zerop (nnimap-initial-resync nnimap-object))) |
| 1757 | (format " (initial sync of %d groups; please wait)" | 1757 | (format " (initial sync of %d group%s; please wait)" |
| 1758 | (nnimap-initial-resync nnimap-object)) | 1758 | (nnimap-initial-resync nnimap-object) |
| 1759 | (if (= (nnimap-initial-resync nnimap-object) 1) | ||
| 1760 | "" | ||
| 1761 | "s")) | ||
| 1759 | ""))) | 1762 | ""))) |
| 1760 | (nnheader-accept-process-output process) | 1763 | (nnheader-accept-process-output process) |
| 1761 | (goto-char (point-max))) | 1764 | (goto-char (point-max))) |