changeset 107008:50223db834f2

Merged from trunk
author Jason Rumney <jasonr@gnu.org>
date Sun, 10 Jan 2010 22:34:14 +0800
parents e8989fe0a353 (current diff) 04c3b0f26a9e (diff)
children 3e16e7dbb4a5
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Sun Jan 10 22:18:39 2010 +0800
+++ b/lisp/gnus/ChangeLog	Sun Jan 10 22:34:14 2010 +0800
@@ -1,3 +1,8 @@
+2010-01-08  Jason Rumney  <jasonr@gnu.org>
+
+	* sieve-manage.el (sieve-manage-parse-capability-1): Loosely match OK
+	response.
+
 2010-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-article-describe-bindings): Work for prefix keys.
--- a/lisp/gnus/sieve-manage.el	Sun Jan 10 22:18:39 2010 +0800
+++ b/lisp/gnus/sieve-manage.el	Sun Jan 10 22:34:14 2010 +0800
@@ -636,7 +636,7 @@
 		  sieve-manage-capability))
 	(push (list str) sieve-manage-capability))
       (forward-line)))
-  (when (re-search-forward (concat "^OK" sieve-manage-server-eol) nil t)
+  (when (re-search-forward (concat "^OK.*" sieve-manage-server-eol) nil t)
     (setq sieve-manage-state 'nonauth)))
 
 (defalias 'sieve-manage-parse-greeting-1 'sieve-manage-parse-capability-1)