leftovers

[apps/madmutt.git] / postpone.c

diff --git a/postpone.c b/postpone.c
index 74490e4..e5a3629 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -27,16 +27,6 @@
 
 #include <imap/imap.h>
 
-static struct mapping_t PostponeHelp[] = {
-  {N_("Exit"),  OP_EXIT},
-  {N_("Del"),   OP_DELETE},
-  {N_("Undel"), OP_UNDELETE},
-  {N_("Help"),  OP_HELP},
-  {NULL,        OP_NULL}
-};
-
-
-
 static short PostCount = 0;
 static CONTEXT *PostContext = NULL;
 static short UpdateNumPostponed = 0;
@@ -132,17 +122,14 @@ void mutt_update_num_postponed (void)
 
 static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
 {
-  CONTEXT *ctx = (CONTEXT *) menu->data;
-
-  _mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
-                     option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+  CONTEXT *ctx = (CONTEXT *)menu->data;
+  _mutt_make_string(s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry], 0);
 }
 
 static HEADER *select_msg (void)
 {
   MUTTMENU *menu;
   int i, done = 0, r = -1;
-  char helpstr[STRING];
   short orig_sort;
 
   menu = mutt_new_menu ();
@@ -151,8 +138,6 @@ static HEADER *select_msg (void)
   menu->max = PostContext->msgcount;
   menu->title = _("Postponed Messages");
   menu->data = PostContext;
-  menu->help =
-    mutt_compile_help (helpstr, sizeof (helpstr), MENU_POST, PostponeHelp);
 
   /* The postponed mailbox is setup to have sorting disabled, but the global
    * Sort variable may indicate something different.   Sorting has to be
@@ -591,7 +576,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
       parameter_delval(&b->parameter, "x-mutt-noconv");
     }
 
-    s.fpout = m_tempfile(file, sizeof(file), NONULL(MCore.tmpdir), file);
+    s.fpout = m_tempfile(file, sizeof(file), NONULL(mod_core.tmpdir), file);
     if (!s.fpout)
       goto bail;