X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=798c4787f49caf308e5ab2e551b8ed1a0b19db9f;hp=82fab8566a91a35ccf0d568c2766c7457fef2457;hb=c8c9a616c8c369da6aa06e656eacfb82af8707a8;hpb=daf6df95bfcc7efc888b488a825e467268f20d3c

diff --git a/init.h b/init.h
index 82fab85..798c478 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
@@ -512,24 +511,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
@@ -1345,7 +1326,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 +1342,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 +1425,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" },
@@ -1499,7 +1480,7 @@ struct option_t MuttVars[] = {
    ** this is \fIunset\fP, it will be set to the operating system name that \fTuname(2)\fP
    ** returns. If \fTuname(2)\fP fails, ``UNIX'' will be used.
    ** .pp
-   ** It may, for example, look as: ``\fTmutt-ng 1.5.9i (Linux)\fP''.
+   ** It may, for example, look as: ``\fTMadmutt 1.5.9i (Linux)\fP''.
    */
   {"sidebar_boundary", DT_STR, R_BOTH, UL &SidebarBoundary, "." },
   /*