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

diff --git a/h/mh.h b/h/mh.h
index 59b5c0f..1f8a23c 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -70,12 +70,12 @@ extern struct swit anoyes[];   /* standard yes/no switches */
 /*
 ** general folder attributes
 */
-#define READONLY   (1<<0)    /* No write access to folder    */
-#define SEQMOD     (1<<1)    /* folder's sequences modifed   */
-#define ALLOW_NEW  (1<<2)    /* allow the "new" sequence     */
-#define OTHERS     (1<<3)    /* folder has other files       */
+#define READONLY      (1<<0)    /* No write access to folder    */
+#define SEQMOD        (1<<1)    /* folder's sequences modifed   */
+#define ALLOW_BEYOND  (1<<2)    /* allow the beyond sequence    */
+#define OTHERS        (1<<3)    /* folder has other files       */
 
-#define FBITS  "\020\01READONLY\02SEQMOD\03ALLOW_NEW\04OTHERS"
+#define FBITS  "\020\01READONLY\02SEQMOD\03ALLOW_BEYOND\04OTHERS"
 
 /*
 ** type for holding the sequence set of a message
@@ -177,8 +177,7 @@ struct msgs {
 #define set_selected(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] |= SELECTED)
 
 #define is_select_empty(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] & SELECT_EMPTY)
-#define set_select_empty(mp,msgnum) \
-    ((mp)->msgstats[(msgnum) - mp->lowoff] |= SELECT_EMPTY)
+#define set_select_empty(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] |= SELECT_EMPTY)
 
 #define is_unseen(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] & SELECT_UNSEEN)
 #define unset_unseen(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~SELECT_UNSEEN)
@@ -253,13 +252,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 +281,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,23 +300,20 @@ extern char *altmsglink;
 extern char *catproc;
 extern char *components;
 extern char *context;
-extern char *current;
+extern char *curfolder;
 extern char *defaulteditor;
 extern char *defaultfolder;
 extern char *digestcomps;
 extern char *distcomps;
 extern char *draftfolder;
-extern char *faceproc;
 extern char *fileproc;
 extern char *foldprot;
 extern char *forwcomps;
 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;
@@ -334,18 +326,25 @@ extern char *nmhstorage;
 extern char *nmhcache;
 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;
 extern char *replcomps;
 extern char *replgroupcomps;
-extern char *rmfproc;
 extern char *rmmproc;
 extern char *sendmail;
 extern char *sendproc;
+extern char *seq_all;
+extern char *seq_beyond;
+extern char *seq_cur;
+extern char *seq_first;
+extern char *seq_last;
+extern char *seq_next;
+extern char *seq_prev;
+extern char *seq_unseen;
+extern char *seq_neg;
 extern char *showmimeproc;
 extern char *showproc;
 extern char *usequence;