# HG changeset patch # User Jason Rumney # Date 1263134054 -28800 # Node ID 50223db834f23304243d6ef0ac4381c50e049800 # Parent e8989fe0a3534aa7b5deba5cd3b8ebd5013e18b8# Parent 04c3b0f26a9e65a5d0388d5d41e1d0c3a1c1a5e5 Merged from trunk diff -r e8989fe0a353 -r 50223db834f2 lisp/gnus/ChangeLog --- 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 + + * sieve-manage.el (sieve-manage-parse-capability-1): Loosely match OK + response. + 2010-01-06 Katsumi Yamaoka * gnus-art.el (gnus-article-describe-bindings): Work for prefix keys. diff -r e8989fe0a353 -r 50223db834f2 lisp/gnus/sieve-manage.el --- 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)