Fix problem with nnimap on Emacs 23.

* proto-stream.el (proto-stream-capability-open): Fall back on
:end-of-command if :end-of-capability doesn't exist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e7e555..5051a6f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-27  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * proto-stream.el (proto-stream-capability-open): Fall back on
+       :end-of-command if :end-of-capability doesn't exist.
+
 2012-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-sum.el (gnus-summary-mode): Don't make bidi-paragraph-direction

diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 3f1d45d..0d2bc5c 100644 (file)
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -280,8 +280,11 @@ PARAMETERS should be a sequence of keywords and values:
                    (plist-get parameters :end-of-command))))
     (list stream greeting
          (and capability-command
-              (proto-stream-command stream capability-command
-                                    (plist-get parameters :end-of-capability)))
+              (proto-stream-command
+               stream capability-command
+               (or
+                (plist-get parameters :end-of-capability)
+                (plist-get parameters :end-of-command))))
          stream-type)))
 
 (provide 'proto-stream)