Fix Gcc processing on imap.

* nnimap.el (nnimap-request-accept-article, nnimap-process-quirk): Fix
Gcc processing on imap.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d36ba50..02248b8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-13  Tassilo Horn  <tassilo@member.fsf.org>  (tiny change)
+
+       * nnimap.el (nnimap-request-accept-article, nnimap-process-quirk): Fix
+       Gcc processing on imap.
+
 2011-02-13  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * imap.el: Remove file.  All the functionality is in nnimap.el.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 94c8f82..be3f812 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -966,7 +966,8 @@ textual parts.")
       (nnimap-add-cr)
       (setq message (buffer-substring-no-properties (point-min) (point-max)))
       (with-current-buffer (nnimap-buffer)
-       (when (setq message (nnimap-process-quirk "OK Gimap " 'append message))
+       (when (setq message (or (nnimap-process-quirk "OK Gimap " 'append message)
+                               message))
          ;; If we have this group open read-only, then unselect it
          ;; before appending to it.
          (when (equal (nnimap-examined nnimap-object) group)
@@ -994,7 +995,7 @@ textual parts.")
 
 (defun nnimap-process-quirk (greeting-match type data)
   (when (and (nnimap-greeting nnimap-object)
-            (string-match "OK Gimap " (nnimap-greeting nnimap-object))
+            (string-match greeting-match (nnimap-greeting nnimap-object))
             (eq type 'append)
             (string-match "\000" data))
     (let ((choice (gnus-multiple-choice