[PATCH] Fix Gcc processing on IMAP

[Tassilo Horn <tassilo@member.fsf.org>]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

Hi all,

as I've reported in <874o8enpi0.fsf@member.fsf.org>, Gcc is broken in
the current HEAD.  I wanted to sit it out on an older working revision
till Lars is back, but unfortunately Ted did an interface change in
auth-sources that was synced to emacs, and now emacs has an autoload
cookie for some auth-sources function that is not available in the older
Gnus version...

Since non-working Gcc is effectively data-loss, I've dug into the
relevant code, and Lars seems to have added some quirk for Gmail, which
breaks any IMAP except Gmail. ;-)

I'm no expert with nnimap.el (in fact, 20 minutes ago I had my first
look at it), but I think I could understand what Lars wanted to do.
Here is a patch that fixes the Gcc issue for me.

I have papers on file, but no push access for Gnus git.  Could someone
please commit and push for me?  (I could commit & push on emacs bzr
trunk, but I think this way is easier.)

Bye,
Tassilo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-nnimap.el-nnimap-request-accept-article-nnimap-proce.patch --]
[-- Type: text/x-patch, Size: 1800 bytes --]

From 6573b041d072fcfacfc7b8e6ae810abeb2f361e7 Mon Sep 17 00:00:00 2001
From: Tassilo Horn <tassilo@member.fsf.org>
Date: Sun, 13 Feb 2011 11:57:42 +0100
Subject: [PATCH] * nnimap.el (nnimap-request-accept-article, nnimap-process-quirk): Fix
 Gcc processing on imap.

---
 lisp/ChangeLog |    5 +++++
 lisp/nnimap.el |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed68f13..1e7b35e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-13  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* nnimap.el (nnimap-request-accept-article, nnimap-process-quirk): Fix
+	Gcc processing on imap.
+
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* message.el (message-bury): Don't pop up a new window when selected
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 94c8f82..be3f812 100644
--- 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
-- 
1.7.4