X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=compose.c;h=8b489c968d602e747e65038082bd79835a523acc;hb=dd5354f76c36f71044f6ddeee61241691c7195ff;hp=d607021a733d09e8978e0bf87a8881c9798bc242;hpb=b8e3053577ab5d351882096830421cd55639cc97;p=apps%2Fmadmutt.git diff --git a/compose.c b/compose.c index d607021..8b489c9 100644 --- a/compose.c +++ b/compose.c @@ -86,32 +86,6 @@ static const char *Prompts[] = { #endif }; -static struct mapping_t ComposeHelp[] = { - {N_("Send"), OP_COMPOSE_SEND_MESSAGE}, - {N_("Abort"), OP_EXIT}, - {"To", OP_COMPOSE_EDIT_TO}, - {"CC", OP_COMPOSE_EDIT_CC}, - {"Subj", OP_COMPOSE_EDIT_SUBJECT}, - {N_("Attach file"), OP_COMPOSE_ATTACH_FILE}, - {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION}, - {N_("Help"), OP_HELP}, - {NULL, OP_NULL} -}; - -#ifdef USE_NNTP -static struct mapping_t ComposeNewsHelp[] = { - {N_("Send"), OP_COMPOSE_SEND_MESSAGE}, - {N_("Abort"), OP_EXIT}, - {"Newsgroups", OP_COMPOSE_EDIT_NEWSGROUPS}, - {"Subj", OP_COMPOSE_EDIT_SUBJECT}, - {N_("Attach file"), OP_COMPOSE_ATTACH_FILE}, - {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION}, - {N_("Help"), OP_HELP}, - {NULL, OP_NULL} -}; -#endif - - static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) { m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt, ((ATTACHPTR **)menu->data)[num], M_FORMAT_STAT_FILE); @@ -466,7 +440,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ ssize_t fcclen, HEADER * cur __attribute__ ((unused))) { /* current message */ - char helpstr[STRING]; char buf[LONG_STRING]; char fname[_POSIX_PATH_MAX]; MUTTMENU *menu; @@ -501,14 +474,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ menu->make_entry = snd_entry; menu->tag = mutt_tag_attach; menu->data = idx; -#ifdef USE_NNTP - if (news) - menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE, - ComposeNewsHelp); - else -#endif - menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE, - ComposeHelp); if (option (OPTMBOXPANE)) buffy_check (0);