X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=af3445fe78da136966f5e7515b3abc044be7dd9c;hp=970580ee355754eeec6b94f8bb9a17b7872445d6;hb=a26f3db04e4acf1ed8ac5711eae58ddeeebb3b15;hpb=9468c36e7656e50a91f759e3f5498b7f86dbec30

diff --git a/init.h b/init.h
index 970580e..af3445f 100644
--- a/init.h
+++ b/init.h
@@ -19,7 +19,6 @@
 
 #include "buffy.h"
 #include "mutt.h"
-#include "version.h"
 
 #ifndef _MAKEDOC
 #define DT_MASK         0x0f
@@ -33,8 +32,6 @@
 #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 via $user_ */
-#define DT_SYS          12      /* pre-defined via $madmutt_ */
 
 #define DTYPE(x) ((x) & DT_MASK)
 
@@ -54,11 +51,13 @@
 #define R_NONE          0
 #define R_INDEX         (1<<0)
 #define R_PAGER         (1<<1)
+#define R_BOTH          (R_INDEX|R_PAGER)
+
+/* TODO:MC: will go in the the thread module */
 #define R_RESORT        (1<<2)  /* resort the mailbox */
 #define R_RESORT_SUB    (1<<3)  /* resort subthreads */
 #define R_RESORT_INIT   (1<<4)  /* resort from scratch */
 #define R_TREE          (1<<5)  /* redraw the thread tree */
-#define R_BOTH          (R_INDEX|R_PAGER)
 #define R_RESORT_BOTH   (R_RESORT|R_RESORT_SUB)
 
 struct option_t {
@@ -546,12 +545,6 @@ 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.
    */
-  {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$madmutt_bindir/muttng_dotlock"},
-  /*
-   ** .pp
-   ** Contains the path of the \fTmadmutt_dotlock(1)\fP binary to be used by
-   ** Madmutt.
-   */
   {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""},
   /*
    ** .pp
@@ -612,13 +605,6 @@ struct option_t MuttVars[] = {
    ** 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, "" },
-  /*
-   ** .pp
-   ** This variable specifies which editor is used by Madmutt.
-   ** It defaults to the value of the \fT$$$VISUAL\fP, or \fT$$$EDITOR\fP, environment
-   ** variable, or to the string "\fTvi\fP" if neither of those are set.
-   */
   {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, "no" },
   /*
    ** .pp
@@ -1368,85 +1354,6 @@ struct option_t MuttVars[] = {
    ** This specifies the folder into which read mail in your ``$$spoolfile''
    ** folder will be appended.
    */
-  {"madmutt_version", DT_SYS, R_NONE, 0, VERSION },
-  /*
-   ** .pp
-   ** \fIThis is a read-only system property and specifies madmutt's
-   ** version string.\fP
-   */
-  {"madmutt_revision", DT_SYS, R_NONE, 0, MUTT_REVISION },
-  /*
-   ** .pp
-   ** \fIThis is a read-only system property and specifies madmutt's
-   ** subversion revision string.\fP
-   */
-  {"madmutt_sysconfdir", DT_SYS, R_NONE, 0, SYSCONFDIR },
-  /*
-   ** .pp
-   ** \fIThis is a read-only system property and specifies the
-   ** directory containing the madmutt system-wide configuration.\fP
-   */
-  {"madmutt_bindir", DT_SYS, R_NONE, 0, BINDIR },
-  /*
-   ** .pp
-   ** \fIThis is a read-only system property and specifies the
-   ** directory containing the madmutt binary.\fP
-   */
-  {"madmutt_docdir", DT_SYS, R_NONE, 0, PKGDOCDIR },
-  /*
-   ** .pp
-   ** \fIThis is a read-only system property and specifies the
-   ** directory containing the madmutt documentation.\fP
-   */
-#ifdef USE_HCACHE
-#if defined(HAVE_QDBM)
-  {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" },
-#elif defined(HAVE_GDBM)
-  {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" },
-#elif defined(HAVE_DB4)
-  {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" },
-#else
-  {"madmutt_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
-  {"madmutt_folder_path", DT_SYS, R_NONE, 0, "" },
-  /*
-   ** .pp
-   ** \fIThis is a read-only system property and, at runtime,
-   ** specifies the full path or URI of the folder currently
-   ** open (if any).\fP
-   */
-  {"madmutt_folder_name", DT_SYS, R_NONE, 0, "" },
-  /*
-   ** .pp
-   ** \fIThis is a read-only system property and, at runtime,
-   ** specifies the actual name of the folder as far as it could
-   ** be detected.\fP
-   ** .pp
-   ** For detection, $$$folder is first taken into account
-   ** and simply stripped to form the result when a match is found. For
-   ** example, with $$$folder being \fTimap://host\fP and the folder is
-   ** \fTimap://host/INBOX/foo\fP, $$$madmutt_folder_name will be just
-   ** \fTINBOX/foo\fP.)
-   ** .pp
-   ** Second, if the initial portion of a name is not $$$folder,
-   ** the result will be everything after the last ``/''.
-   ** .pp
-   ** Third and last, the result will be just the name if neither
-   ** $$$folder nor a ``/'' were found in the name.
-   */
-  {"madmutt_pwd", DT_SYS, R_NONE, 0, "" },
-  /*
-   ** .pp
-   ** \fIThis is a read-only system property and, at runtime,
-   ** specifies the current working directory of the madmutt
-   ** binary.\fP
-   */
   {"operating_system", DT_STR, R_NONE, UL &OperatingSystem, "" },
   /*
    ** .pp
@@ -2813,14 +2720,6 @@ struct option_t MuttVars[] = {
    ** with the query string the user types.  See ``$query'' for more
    ** information.
    */
-  {"quit", DT_QUAD, R_NONE, OPT_QUIT, "yes" },
-  /*
-   ** .pp
-   ** This variable controls whether ``quit'' and ``exit'' actually quit
-   ** from Madmutt.  If it set to \fIyes\fP, they do quit, if it is set to \fIno\fP, they
-   ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
-   ** prompted for confirmation when you try to quit.
-   */
   {"quote_empty", DT_BOOL, R_NONE, OPTQUOTEEMPTY, "yes" },
   /*
    ** .pp
@@ -3038,13 +2937,6 @@ struct option_t MuttVars[] = {
    ** \fTiso-8859-2\fP, \fTkoi8-r\fP or \fTiso-2022-jp\fP) either
    ** instead of or after \fTiso-8859-1\fP.
    */
-  {"sendmail", DT_PATH, R_NONE, UL &Sendmail, SENDMAIL " -oem -oi"},
-  /*
-   ** .pp
-   ** Specifies the program and arguments used to deliver mail sent by Madmutt.
-   ** Madmutt expects that the specified program interprets additional
-   ** arguments as recipient addresses.
-   */
   {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, "0" },
   /*
    ** .pp
@@ -3062,12 +2954,6 @@ struct option_t MuttVars[] = {
    ** process will be put in a temporary file.  If there is some error, you
    ** will be informed as to where to find the output.
    */
-  {"shell", DT_PATH, R_NONE, UL &Shell, "" },
-  /*
-   ** .pp
-   ** Command to use when spawning a subshell.  By default, the user's login
-   ** shell from \fT/etc/passwd\fP is used.
-   */
 #ifdef USE_NNTP
   {"nntp_save_unsubscribed", DT_BOOL, R_NONE, OPTSAVEUNSUB, "no" },
   /*