Merge commit 'upstream/1.5.20'

[software/mutt-debian.git] / compose.c

diff --git a/compose.c b/compose.c
index 28296460390bb7854f53f3e6294d9308c68f40a9..5db4c92efb7a558aa6f2026d4b07e3d8765f779a 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -94,7 +94,7 @@ static struct mapping_t ComposeHelp[] = {
   { N_("Attach file"),  OP_COMPOSE_ATTACH_FILE },
   { N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION },
   { N_("Help"),    OP_HELP },
-  { NULL }
+  { NULL,      0 }
 };
 
 static void snd_entry (char *b, size_t blen, MUTTMENU *menu, int num)
@@ -1073,7 +1073,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
            FREE (&idx[idxlen]);
            continue;
          }
-         fclose (fp);
+         safe_fclose (&fp);
 
          if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL)
          {