X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=a12d82d2292eb72966884b3de1db16dd28174652;hp=1676acd0b9be9362f1a9d56a0560e8d2e4695c0d;hb=105e395f06e15f2c3878d856bc278dd2cf971794;hpb=68e9c3fe5664c1e13093e24dd15415ac000af70c

diff --git a/init.h b/init.h
index 1676acd..a12d82d 100644
--- a/init.h
+++ b/init.h
@@ -885,8 +885,10 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** Specifies the hostname to use after the ``\fT@\fP'' in local e-mail
-   ** addresses.  This overrides the compile time definition obtained from
-   ** \fT/etc/resolv.conf\fP.
+   ** addresses and during generation of \fTMessage-Id:\fP headers.
+   ** .pp
+   ** Please be sure to really know what you are doing when changing this variable
+   ** to configure a custom domain part of Message-IDs.
    */
   {"ignore_list_reply_to", DT_BOOL, R_NONE, OPTIGNORELISTREPLYTO, 0},
   /*
@@ -1259,8 +1261,8 @@ struct option_t MuttVars[] = {
    ** .pp
    ** If $$header_cache points to a directory it will contain a header cache
    ** database  per folder. If $$header_cache points to a file that file will
-   ** be a single global header cache. By default it is \fIunset\fP and so no
-   ** header caching will be done.
+   ** be a single global header cache. By default it is \fIunset\fP so no
+   ** header caching will be used.
    */
   {"maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1},
   /*
@@ -1272,6 +1274,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
   {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384"},
   /*
    ** .pp
@@ -1283,9 +1286,19 @@ struct option_t MuttVars[] = {
    ** Too large
    ** or too small of a page size for the common header can waste
    ** space, memory effectiveness, or CPU time. The default should be more or
-   ** less the best you can get. For details google after Mutt-ng maildir header
+   ** less the best you can get. For details google for mutt header
    ** cache (first hit).
    */
+#endif /* HAVE_GDBM || HAVE_DB 4 */
+#if HAVE_QDBM
+  { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 },
+  /*
+  ** .pp
+  ** If enabled the header cache will be compressed. So only one fifth of the usual
+  ** diskspace is used, but the uncompression can result in a slower open of the
+  ** cached folder.
+  */
+#endif /* HAVE_QDBM */
 #endif /* USE_HCACHE */
   {"maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, 0},
   /*
@@ -1563,8 +1576,8 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** This is the format for the ``local part'' of the \fTMessage-Id:\fP header
-   ** field generated
-   ** by Mutt-ng. The format string contains of one or more characters. The '%'
+   ** field generated by Mutt-ng. If this variable is empty, no \fTMessage-Id:\fP
+   ** headers will be generated. The '%'
    ** character marks that certain data will be added to the string, similar to
    ** \fTprintf(3)\fP. The following characters are allowed:
    ** .pp
@@ -3595,120 +3608,137 @@ const struct feature_t Features[] = {
 #endif
    }, {"slang",
 #ifdef USE_SLANG_CURSES
-       1
+   1
 #else
-       0
+   0
 #endif
-       }, {"iconv",
+   }, {"iconv",
 #ifdef _LIBICONV_VERSION
-           1
+   1
 #else
-           0
+   0
 #endif
-           }, {"idn",
+   }, {"idn",
 #ifdef HAVE_LIBIDN
-               1
+   1
 #else
-               0
+   0
 #endif
-               }, {"dotlock",
+   }, {"dotlock",
 #ifdef USE_DOTLOCK
-                   1
+   1
 #else
-                   0
+   0
 #endif
-                   }, {"standalone",
+   }, {"standalone",
 #ifdef DL_STANDALONE
-                       1
+   1
 #else
-                       0
+   0
 #endif
-                       }, {"pop",
+   }, {"pop",
 #ifdef USE_POP
-                           1
+   1
 #else
-                           0
+   0
 #endif
-                           }, {"nntp",
+   }, {"nntp",
 #ifdef USE_NNTP
-                               1
+   1
 #else
-                               0
+   0
 #endif
-                               }, {"imap",
+   }, {"imap",
 #ifdef USE_IMAP
-                                   1
+   1
 #else
-                                   0
+   0
 #endif
-                                   }, {"ssl",
+   }, {"ssl",
 #ifdef USE_SSL
-                                       1
+   1
 #else
-                                       0
+   0
 #endif
-                                       }, {"gnutls",
+   }, {"gnutls",
 #ifdef USE_GNUTLS
-                                           1
+   1
 #else
-                                           0
+   0
 #endif
-                                           }, {"sasl",
+   }, {"sasl",
 #ifdef USE_SASL
-                                               1
+   1
 #else
-                                               0
+   0
 #endif
-                                               }, {"sasl2",
+   }, {"sasl2",
 #ifdef USE_SASL2
-                                                   1
+   1
 #else
-                                                   0
+   0
 #endif
-                                                   }, {"libesmtp",
+   }, {"libesmtp",
 #ifdef USE_LIBESMTP
-                                                       1
+   1
 #else
-                                                       0
+   0
 #endif
-                                                       }, {"compressed",
+   }, {"compressed",
 #ifdef USE_COMPRESSED
-                                                           1
+   1
 #else
-                                                           0
+   0
 #endif
-                                                           }, {"color",
+   }, {"color",
 #ifdef HAVE_COLOR
-                                                               1
+   1
 #else
-                                                               0
+   0
 #endif
-                                                               },
-    {"classic_pgp",
+   }, {"classic_pgp",
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
-     1
+   1
 #else
-     0
+   0
 #endif
-     }, {"classic_smime",
+   }, {"classic_smime",
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
-         1
+   1
 #else
-         0
+   0
 #endif
-         }, {"gpgme",
+   }, {"gpgme",
 #ifdef CRYPT_BACKEND_GPGME
-             1
+   1
 #else
-             0
+   0
 #endif
-             }, {"header_cache",
+   }, {"header_cache",
 #ifdef USE_HCACHE
-                 1
+   1
 #else
-                 0
+   0
+#endif
+   }, {"qdbm",
+#ifdef HAVE_QDBM
+   1
+#else
+   0
+#endif
+   }, {"gdbm",
+#ifdef HAVE_GDBM
+   1
+#else
+   0
+#endif
+   }, {"db4",
+#ifdef HAVE_DB4
+   1
+#else
+   0
 #endif
-                 },
+   },
   /* last */
   {NULL, 0}
 };
@@ -3835,8 +3865,8 @@ struct command_t Commands[] = {
   {"ignore", parse_ignore, 0},
   {"lists", parse_lists, 0},
   {"macro", mutt_parse_macro, 0},
-  {"mailboxes", mutt_parse_mailboxes, M_MAILBOXES},
-  {"unmailboxes", mutt_parse_mailboxes, M_UNMAILBOXES},
+  {"mailboxes", buffy_parse_mailboxes, M_MAILBOXES},
+  {"unmailboxes", buffy_parse_mailboxes, M_UNMAILBOXES},
   {"message-hook", mutt_parse_hook, M_MESSAGEHOOK},
   {"mbox-hook", mutt_parse_hook, M_MBOXHOOK},
   {"mime_lookup", parse_list, UL &MimeLookupList},