X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=4fe6eb4dd12e71dcd762535634b0fc61b0928905;hp=643268e0f5529076b0af9e1e2bb359b837c1d312;hb=4b2f5f58e6b8e65e8524596d16752f7f1e5d58ca;hpb=8ab1ab66eb1c4b95f9b2a5ed9c2b2cf1dfa74544

diff --git a/compose.c b/compose.c
index 643268e..4fe6eb4 100644
--- a/compose.c
+++ b/compose.c
@@ -442,8 +442,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
   menu->tag = mutt_tag_attach;
   menu->data = idx;
 
-  if (option (OPTMBOXPANE))
-    buffy_check (0);
   while (loop) {
 #ifdef USE_NNTP
     unset_option (OPTNEWS);     /* for any case */
@@ -688,8 +686,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         else
 #endif
           mutt_expand_path (fname, sizeof (fname));
-        if (mx_get_magic (fname) != M_IMAP)
-          if (mx_get_magic (fname) != M_POP)
+        if (mx_get_magic (fname) != M_IMAP && mx_get_magic (fname) != M_POP) {
 #ifdef USE_NNTP
             if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS))
 #endif
@@ -698,6 +695,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                 mutt_perror (fname);
                 break;
               }
+        }
 
         menu->redraw = REDRAW_FULL;
 
@@ -711,7 +709,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           mx_close_mailbox (ctx, NULL);
           p_delete(&ctx);
           mutt_error _("No messages in that folder.");
-
           break;
         }
 
@@ -750,7 +747,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
               update_idx (menu, idx, idxlen++);
             else {
               mutt_error _("Unable to attach!");
-
               p_delete(&idx[idxlen]);
             }
           }
@@ -1170,9 +1166,9 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
     /* Draw formated compose status line */
     if (menu->redraw & REDRAW_STATUS) {
       compose_status_line (buf, sizeof (buf), menu, NONULL (ComposeFormat));
-      CLEARLINE(main_w, option (OPTSTATUSONTOP) ? 0 : LINES - 2);
+      CLEARLINE(main_w, 0);
       SETCOLOR(main_w, MT_COLOR_STATUS);
-      wmove (main_w, option (OPTSTATUSONTOP) ? 0 : LINES - 2, 0);
+      wmove (main_w, 0, 0);
       wprintw (main_w, "%-*.*s", getmaxx(main_w), getmaxx(main_w), buf);
       SETCOLOR(main_w, MT_COLOR_NORMAL);
       menu->redraw &= ~REDRAW_STATUS;