# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1283753140 0
# Node ID 51163d71c385ec9e818957b8cf773e7c6729c96e
# Parent  77821d09740a9b10ad7889d56cbe66f78323dad6# Parent  3d216398af49621ee31c2afd8bcf4ac6cc4c1f09
Merge from mainline.

diff -r 77821d09740a -r 51163d71c385 lisp/gnus/ChangeLog
--- 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
diff -r 77821d09740a -r 51163d71c385 lisp/gnus/pop3.el
--- 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))