wibble.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/compose.c b/compose.c
index 42fef17..4fe6eb4 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -686,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
@@ -696,6 +695,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                 mutt_perror (fname);
                 break;
               }
+        }
 
         menu->redraw = REDRAW_FULL;
 
@@ -709,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;
         }
 
@@ -748,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]);
             }
           }

diff --git a/main.c b/main.c
index 4d322dc..885655a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -252,9 +252,6 @@ int main (int argc, char **argv)
   srand48 (time (NULL));
   umask (077);
 
-  p_clear(Options, countof(Options));
-  p_clear(QuadOptions, countof(QuadOptions));
-
   while ((i = getopt(argc, argv, "a:b:F:f:c:e:H:s:i:hnpRTtvyzZ"
 #ifdef USE_NNTP
                                                                     "g:G"