X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=e1064014a8662d29e8c7a69f873d101da95b595a;hp=f411a0fe0fe40e863349b2645cd96624df0f6460;hb=6771688a116512f5fc5ce0844dc5987a22c2e0f6;hpb=5e53f9e5f65aa5b3af6f5af9d868403536534afb diff --git a/init.h b/init.h index f411a0f..e106401 100644 --- a/init.h +++ b/init.h @@ -108,9 +108,6 @@ struct option_t { # ifndef USE_DOTLOCK # define USE_DOTLOCK # endif -# ifndef DL_STANDALONE -# define DL_STANDALONE -# endif # ifndef USE_HCACHE # define USE_HCACHE # endif @@ -122,7 +119,7 @@ struct option_t { # endif #endif -struct option_t const MuttVars[] = { +struct option_t MuttVars[] = { /*++*/ {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" }, /* @@ -597,11 +594,11 @@ struct option_t const MuttVars[] = { ** is viewed it is passed as standard input to $$display_filter, and the ** filtered message is read from the standard output. */ -#if defined(DL_STANDALONE) && defined(USE_DOTLOCK) +#if defined(USE_DOTLOCK) {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$muttng_bindir/muttng_dotlock"}, /* ** .pp - ** Availability: Standalone and Dotlock + ** Availability: Dotlock ** ** .pp ** Contains the path of the \fTmuttng_dotlock(1)\fP binary to be used by @@ -3873,9 +3870,6 @@ static const char* Features[] = { #ifdef USE_DOTLOCK "dotlock", #endif -#ifdef DL_STANDALONE - "standalone", -#endif #ifdef USE_POP "pop", #endif @@ -3897,18 +3891,9 @@ static const char* Features[] = { #ifdef USE_LIBESMTP "libesmtp", #endif -#ifdef USE_COMPRESSED - "compessed", -#endif #ifdef HAVE_COLOR "color", #endif -#ifdef CRYPT_BACKEND_CLASSIC_PGP - "classic_pgp", -#endif -#ifdef CRYPT_BACKEND_CLASSIC_SMIME - "class_smime", -#endif #ifdef CRYPT_BACKEND_GPGME "gpgme", #endif @@ -4038,11 +4023,9 @@ struct command_t Commands[] = { {"fcc-hook", mutt_parse_hook, M_FCCHOOK}, {"fcc-save-hook", mutt_parse_hook, M_FCCHOOK|M_SAVEHOOK}, {"folder-hook", mutt_parse_hook, M_FOLDERHOOK}, -#ifdef USE_COMPRESSED {"open-hook", mutt_parse_hook, M_OPENHOOK}, {"close-hook", mutt_parse_hook, M_CLOSEHOOK}, {"append-hook", mutt_parse_hook, M_APPENDHOOK}, -#endif {"hdr_order", parse_list, UL &HeaderOrderList}, {"ifdef", parse_ifdef, 1}, {"ifndef", parse_ifdef, 0},