X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap.c;h=4b85e288acc3617c6e2f98fde8b3b5c36cf631fb;hp=c214ddfe90f160bbb11608dc5214de4ae5b09f0c;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=7b392ef7b50798f9eb3e7c869e634c5fef0092d1

diff --git a/imap/imap.c b/imap/imap.c
index c214ddf..4b85e28 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -16,6 +16,7 @@
 
 #include "mutt.h"
 #include "globals.h"
+#include "pattern.h"
 #include "sort.h"
 #include "browser.h"
 #include "message.h"
@@ -178,7 +179,6 @@ int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes, progress_t* bar
       return -1;
     }
 
-#if 1
     if (r == 1 && c != '\n')
       fputc ('\r', fp);
 
@@ -188,7 +188,7 @@ int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes, progress_t* bar
     }
     else
       r = 0;
-#endif
+
     fputc (c, fp);
     if (bar && !(pos % 1024))
       mutt_progress_bar (bar, pos);
@@ -1621,7 +1621,7 @@ static int _imap_check_mailbox (CONTEXT* ctx,
 static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
   int r = 0;
 
-  if ((r = safe_fclose (&msg->fp)) == 0)
+  if ((r = m_fclose(&msg->fp)) == 0)
     r = imap_append_message (ctx, msg);
   return (r);
 }