* pop3.el (pop3-open-server): Error messages are "-ERR".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17a2f4e..aae2d14 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * pop3.el (pop3-open-server): Error messages are "-ERR".
+
 2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * pop3.el (pop3-open-server): Upgrade opportunistically to STARTTLS.

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 3ca5cab..96b2ae1 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -306,7 +306,7 @@ Returns the process associated with the connection."
                    (t
                     (or pop3-stream-type 'network)))
             :capability-command "CAPA\r\n"
-            :end-of-command "^\\.\r?\n\\|^\\+[A-Z]+ .*\n"
+            :end-of-command "^\\.\r?\n\\|^\\(-ERR\\|+OK \\).*\n"
             :success "^\\+OK.*\n"
             :return-list t
             :starttls-function