X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=init.h;h=a61c4af10cce60501bd58f33446ad6b02dd4021f;hb=8e075eda08c6f099ec6988e16607fb4f6a10ba92;hp=aa2c2bdd00277e64f25f677c1ef67ac8a063834a;hpb=e7ca08ff86e3d01578d024a62385bafe7bceffd2;p=apps%2Fmadmutt.git

diff --git a/init.h b/init.h
index aa2c2bd..a61c4af 100644
--- a/init.h
+++ b/init.h
@@ -20,7 +20,6 @@
 #include "buffy.h"
 #include "mutt.h"
 #include "version.h"
-#include "lib/debug.h"
 
 #ifndef _MAKEDOC
 #define DT_MASK         0x0f
@@ -81,9 +80,6 @@ struct option_t {
 /* build complete documentation */
 
 #ifdef _MAKEDOC
-# ifndef MIXMASTER
-#  define MIXMASTER "mixmaster"
-# endif
 # ifndef USE_SSL
 #  define USE_SSL
 # endif
@@ -96,9 +92,6 @@ struct option_t {
 # ifndef USE_GNUTLS
 #  define USE_GNUTLS
 # endif
-# ifndef USE_DOTLOCK
-#  define USE_DOTLOCK
-# endif
 # ifndef USE_HCACHE
 #  define USE_HCACHE
 # endif
@@ -512,24 +505,6 @@ struct option_t MuttVars[] = {
    ** rest of the string are expanded in the \fIC\fP locale (that is in US
    ** English).
    */
-#ifdef DEBUG
-  {"debug_level", DT_NUM, R_NONE, UL &DebugLevel, "1" },
-  /*
-   ** .pp
-   ** Availability: debug
-   **
-   ** .pp
-   ** This variable specifies the current debug level and
-   ** may be used to increase or decrease the verbosity level
-   ** during runtime. It overrides the level given with the
-   ** \fT-d\fP command line option.
-   **
-   ** .pp
-   ** Currently, this number must be >= 0 and <= 5 and madmutt
-   ** must be started with \fT-d\fP to enable debugging at all;
-   ** enabling at runtime is not possible.
-   */
-#endif
   {"default_hook", DT_STR, R_NONE, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"},
   /*
    ** .pp
@@ -585,17 +560,12 @@ struct option_t MuttVars[] = {
    ** is viewed it is passed as standard input to $$display_filter, and the
    ** filtered message is read from the standard output.
    */
-#if defined(USE_DOTLOCK)
   {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$madmutt_bindir/muttng_dotlock"},
   /*
-   ** .pp
-   ** Availability: Dotlock
-   **
    ** .pp
    ** Contains the path of the \fTmadmutt_dotlock(1)\fP binary to be used by
    ** Madmutt.
    */
-#endif
   {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""},
   /*
    ** .pp
@@ -1321,7 +1291,6 @@ struct option_t MuttVars[] = {
    ** DOING!\fP
    */
 #ifdef USE_HCACHE
-
   {"header_cache", DT_PATH, R_NONE, UL &HeaderCache, "" },
   /*
    ** .pp
@@ -1345,7 +1314,7 @@ struct option_t MuttVars[] = {
    ** files when the header cache is in use. This incurs one \fTstat(2)\fP per
    ** message every time the folder is opened.
    */
-#if HAVE_GDBM || HAVE_DB4
+#if defined(HAVE_GDBM) || defined(HAVE_DB4)
   {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, "16384"},
   /*
    ** .pp
@@ -1361,7 +1330,7 @@ struct option_t MuttVars[] = {
    ** cache (first hit).
    */
 #endif /* HAVE_GDBM || HAVE_DB 4 */
-#if HAVE_QDBM
+#ifdef HAVE_QDBM
   { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" },
   /*
   ** .pp
@@ -1444,11 +1413,11 @@ struct option_t MuttVars[] = {
    ** directory containing the madmutt documentation.\fP
    */
 #ifdef USE_HCACHE
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" },
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" },
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" },
 #else
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "unknown" },
@@ -1662,7 +1631,6 @@ struct option_t MuttVars[] = {
    ** menu, attachments which cannot be decoded in a reasonable manner will
    ** be attached to the newly composed message if this option is set.
    */
-
 #ifdef USE_NNTP
   {"nntp_mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, "yes" },
   /*
@@ -1676,13 +1644,8 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP Only change this setting if you know what you are doing.
    */
 #endif
-
-#ifdef MIXMASTER
   {"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"},
   /*
-   ** .pp
-   ** Availability: Mixmaster
-   **
    ** .pp
    ** This variable describes the format of a remailer line on the mixmaster
    ** chain selection screen.  The following \fTprintf(3)\fP-like sequences are 
@@ -1697,16 +1660,12 @@ struct option_t MuttVars[] = {
    */
   {"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, MIXMASTER},
   /*
-   ** .pp
-   ** Availability: Mixmaster
-   **
    ** .pp
    ** This variable contains the path to the Mixmaster binary on your
    ** system.  It is used with various sets of parameters to gather the
    ** list of known remailers, and to finally send a message through the
    ** mixmaster chain.
    */
-#endif
   {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" },
   /*
    ** .pp
@@ -2208,7 +2167,6 @@ struct option_t MuttVars[] = {
    */
 
   /* XXX Default values! */
-
   {"pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, "" },
   /*
    ** .pp
@@ -3459,19 +3417,6 @@ struct option_t MuttVars[] = {
    ** ``X-Mailto-'' and the message including headers will be shown in the editor
    ** regardless of what ``$$edit_headers'' is set to.
    **/
-  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "yes" },
-  /*
-   ** .pp
-   ** When \fIunset\fP, non MIME-compliant messages that doesn't have any
-   ** charset indication in the ``\fTContent-Type:\fP'' header field can 
-   ** be displayed (non MIME-compliant messages are often generated by old
-   ** mailers or buggy mailers like MS Outlook Express).
-   ** See also $$assumed_charset.
-   ** .pp
-   ** This option also replaces linear-white-space between encoded-word
-   ** and *text to a single space to prevent the display of MIME-encoded
-   ** ``\fTSubject:\fP'' header field from being devided into multiple lines.
-   */
   {"strict_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTSTRICTTHREADS, "no" },
   /*
    ** .pp
@@ -3754,6 +3699,7 @@ struct option_t MuttVars[] = {
    */
 #endif
   /*--*/
+  {"strict_mime", DT_BOOL, R_NONE, OPTSTRICTMIME, "yes" },
   { NULL, -1, R_NONE, -1, NULL }
 };
 
@@ -3770,9 +3716,6 @@ static const char* Features[] = {
 #ifdef HAVE_LIBIDN
   "idn",
 #endif
-#ifdef USE_DOTLOCK
-  "dotlock",
-#endif
 #ifdef USE_NNTP
   "nntp",
 #endif