X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fmh.h;h=0c0d81fa4b661b5304badc2bd2c6048a7c4fdafd;hp=59b5c0f8ab1dc8c7dd3e12f1039ecf78e6825378;hb=7030d7edb099bff36ded7548bb5380f7acab4f9b;hpb=097c84b61603c4a4c5837f3dcc09c30a1e751702

diff --git a/h/mh.h b/h/mh.h
index 59b5c0f..0c0d81f 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -253,13 +253,6 @@ extern char *msg_delim;      /*  .. */
 
 #define NOUSE    0        /* draft being re-used */
 
-#define TFOLDER  0        /* path() given a +folder */
-#define TFILE    1        /* path() given a file    */
-#define TSUBCWF  2        /* path() given a @folder */
-
-#define FDEF     0        /* getfolder() want default */
-#define FCUR     1        /* getfolder() want current */
-
 #define OUTPUTLINELEN  72    /* default line length for headers */
 
 /*
@@ -289,9 +282,12 @@ extern char ctxflags;
 
 extern char *invo_name;      /* command invocation name         */
 extern char *mypath;         /* user's $HOME                    */
+extern char *mmhdir;
+extern char *mmhpath;
 extern char *defpath;        /* pathname of user's profile      */
 extern char *ctxpath;        /* pathname of user's context      */
 extern struct node *m_defs;  /* list of profile/context entries */
+extern char *mailstore;      /* name of mail storage directory  */
 
 /*
 ** These standard strings are defined in config.c.  They are the
@@ -305,6 +301,7 @@ extern char *altmsglink;
 extern char *catproc;
 extern char *components;
 extern char *context;
+extern char *curfolder;
 extern char *current;
 extern char *defaulteditor;
 extern char *defaultfolder;
@@ -319,9 +316,8 @@ extern char *inbox;
 extern char *incproc;
 extern char *installproc;
 extern char *lproc;
+extern char *mhetcdir;
 extern char *mailproc;
-extern char *mh_defaults;
-extern char *mh_profile;
 extern char *mh_seq;
 extern char *mhlformat;
 extern char *mhlforward;
@@ -336,7 +332,7 @@ extern char *nmhprivcache;
 extern char *nsequence;
 extern char *packproc;
 extern char *postproc;
-extern char *pfolder;
+extern char *profile;
 extern char *psequence;
 extern char *rcvdistcomps;
 extern char *rcvstoreproc;