X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=aaf956a1ffeb7d7d14fbc57d5761003af1d39295;hp=4398ad0e0ee78c2d3414b7ca5824d124dada87df;hb=452ffdd4bbcd8f2dd9e4811c115824b556814ebb;hpb=338946f4597bd0f4bc2510a4fef1527f2d526c23

diff --git a/init.h b/init.h
index 4398ad0..aaf956a 100644
--- a/init.h
+++ b/init.h
@@ -18,6 +18,8 @@
 #endif
 
 #include "buffy.h"
+#include "mutt.h"
+#include "version.h"
 #include "lib/debug.h"
 
 #ifndef _MAKEDOC
@@ -32,7 +34,8 @@
 #define DT_MAGIC        8       /* mailbox type */
 #define DT_SYN          9       /* synonym for another variable */
 #define DT_ADDR         10      /* e-mail address */
-#define DT_USER         11      /* user defined viar $user_ */
+#define DT_USER         11      /* user defined via $user_ */
+#define DT_SYS          12      /* pre-defined via $muttng_ */
 
 #define DTYPE(x) ((x) & DT_MASK)
 
@@ -589,7 +592,7 @@ struct option_t MuttVars[] = {
    ** filtered message is read from the standard output.
    */
 #if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
-  {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, BINDIR "/muttng_dotlock"},
+  {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$muttng_bindir/muttng_dotlock"},
   /*
    ** .pp
    ** Availability: Standalone and Dotlock
@@ -639,6 +642,25 @@ struct option_t MuttVars[] = {
    ** .pp
    ** This option allows you to edit the header of your outgoing messages
    ** along with the body of your message.
+   **
+   ** .pp
+   ** Which empty header fields to show is controlled by the
+   ** $$editor_headers option.
+   */
+#ifdef USE_NNTP
+  {"editor_headers", DT_STR, R_NONE, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To: Newsgroups: Followup-To: X-Comment-To:" },
+#else
+  {"editor_headers", DT_STR, R_NONE, UL &EditorHeaders, "From: To: Cc: Bcc: Subject: Reply-To:" },
+#endif
+  /*
+   ** .pp
+   ** If $$edit_headers is \fIset\fP, this space-separated list specifies
+   ** which \fInon-empty\fP header fields to edit in addition to
+   ** user-defined headers.
+   **
+   ** .pp
+   ** Note: if $$edit_headers had to be turned on by force because
+   ** $$strict_mailto is \fIunset\fP, this option has no effect.
    */
   {"editor", DT_PATH, R_NONE, UL &Editor, "" },
   /*
@@ -1435,6 +1457,52 @@ struct option_t MuttVars[] = {
    ** This specifies the folder into which read mail in your ``$$spoolfile''
    ** folder will be appended.
    */
+  {"muttng_version", DT_SYS, R_NONE, 0, VERSION },
+  /*
+   ** .pp
+   ** \fIThis is a read-only system property and specifies muttng's
+   ** version string.\fP
+   */
+  {"muttng_revision", DT_SYS, R_NONE, 0, MUTT_REVISION },
+  /*
+   ** .pp
+   ** \fIThis is a read-only system property and specifies muttng's
+   ** subversion revision string.\fP
+   */
+  {"muttng_sysconfdir", DT_SYS, R_NONE, 0, SYSCONFDIR },
+  /*
+   ** .pp
+   ** \fIThis is a read-only system property and specifies the
+   ** directory containing the muttng system-wide configuration.\fP
+   */
+  {"muttng_bindir", DT_SYS, R_NONE, 0, BINDIR },
+  /*
+   ** .pp
+   ** \fIThis is a read-only system property and specifies the
+   ** directory containing the muttng binary.
+   */
+  {"muttng_docdir", DT_SYS, R_NONE, 0, PKGDOCDIR },
+  /*
+   ** .pp
+   ** \fIThis is a read-only system property and specifies the
+   ** directory containing the muttng documentation.\fP
+   */
+#if USE_HCACHE
+#if HAVE_QDBM
+  {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" },
+#elif HAVE_GDBM
+  {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" },
+#elif HAVE_DB4
+  {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "db4" },
+#else
+  {"muttng_hcache_backend", DT_SYS, R_NONE, 0, "unknown" },
+#endif
+  /*
+   ** .pp
+   ** \fIThis is a read-only system property and specifies the
+   ** header chaching's database backend.\fP
+   */
+#endif
   {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, "" },
   /*
    ** .pp