net/imap.el: Remove file. All the functionality is in nnimap.el.

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

lisp/ChangeLog

 2011-02-13  Teodor Zlatanov  <tzz@lifelogs.com>
+	* net/imap.el: Remove file.  All the functionality is in nnimap.el.
+
 	* net/imap-hash.el: Remove file.
 2011-02-13  Michael Albinus  <michael.albinus@gmx.de>

lisp/gnus/ChangeLog

+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-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 	* message.el (message-bury): Don't pop up a new window when selected

lisp/gnus/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