Mercurial > emacs
changeset 110251:51163d71c385
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 06 Sep 2010 06:05:40 +0000 |
| parents | 77821d09740a (current diff) 3d216398af49 (diff) |
| children | c3d46c9f8007 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Sep 06 00:55:41 2010 +0000 +++ b/lisp/gnus/ChangeLog Mon Sep 06 06:05:40 2010 +0000 @@ -1,3 +1,8 @@ +2010-09-06 Katsumi Yamaoka <yamaoka@jpl.org> + + * pop3.el: Require cl when compiling. + (pop3-number-of-responses): Search for "+OK", not "+OK ". + 2010-09-05 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-start.el (gnus-get-unread-articles): Don't bother with groups
--- a/lisp/gnus/pop3.el Mon Sep 06 00:55:41 2010 +0000 +++ b/lisp/gnus/pop3.el Mon Sep 06 06:05:40 2010 +0000 @@ -33,6 +33,7 @@ ;;; Code: +(eval-when-compile (require 'cl)) (require 'mail-utils) (defvar parse-time-months) @@ -204,7 +205,7 @@ (let ((responses 0)) (save-excursion (goto-char (point-min)) - (while (or (and (re-search-forward "^\\+OK " nil t) + (while (or (and (re-search-forward "^\\+OK" nil t) (or (not endp) (re-search-forward "^\\.\r?\n" nil t))) (re-search-forward "^-ERR " nil t))