X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fmh.h;h=73845a41fbc77d6cd79f21ff033f203c64659b22;hp=8ca6c4411f04e6320094e871fb76862d17d8258f;hb=2c8265621a3526d1d6791d28bef778df49501a29;hpb=682962d94b21e120c78a52a8bdcb6aa994330a14

diff --git a/h/mh.h b/h/mh.h
index 8ca6c44..73845a4 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
@@ -83,28 +83,26 @@ extern struct swit anoyes[];   /* standard yes/no switches */
 typedef unsigned int seqset_t;
 
 /*
-** Determine the number of user defined sequences we
-** can have.  The first 5 sequence flags are for
-** internal nmh message flags.
+** internal messages attributes (sequences)
 */
-#define NUMATTRS  ((sizeof(seqset_t) * Nbby) - 5)
+#define EXISTS        (1<<0)    /* exists            */
+#define SELECTED      (1<<1)    /* selected for use  */
+#define SELECT_EMPTY  (1<<2)    /* "new" message     */
+#define SELECT_UNSEEN (1<<3)    /* inc/show "unseen" */
+
+#define MBITS "\020\01EXISTS\02SELECTED\03NEW\04UNSEEN"
 
 /*
-** first free slot for user defined sequences
-** and attributes
+** first free slot for user-defined sequences
 */
-#define FFATTRSLOT  5
+#define FFATTRSLOT  4
 
 /*
-** internal messages attributes (sequences)
+** Determine the number of user defined sequences we
+** can have.  The first few sequence flags are for
+** internal nmh message flags.
 */
-#define EXISTS        (1<<0)    /* exists            */
-#define DELETED       (1<<1)    /* deleted           */
-#define SELECTED      (1<<2)    /* selected for use  */
-#define SELECT_EMPTY  (1<<3)    /* "new" message     */
-#define SELECT_UNSEEN (1<<4)    /* inc/show "unseen" */
-
-#define MBITS "\020\01EXISTS\02DELETED\03SELECTED\04NEW\05UNSEEN"
+#define NUMATTRS  ((sizeof(seqset_t) * Nbby) - FFATTRSLOT)
 
 /*
 ** Primary structure of folder/message information
@@ -177,8 +175,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)
@@ -282,9 +279,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
@@ -298,23 +298,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;
@@ -327,18 +324,25 @@ extern char *nmhstorage;
 extern char *nmhcache;
 extern char *nmhprivcache;
 extern char *nsequence;
-extern char *packproc;
 extern char *postproc;
-extern char *curfolder;
+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;