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

diff --git a/h/mh.h b/h/mh.h
index 1f8a23c..ef4ca62 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -65,8 +65,6 @@ struct swit {
 
 extern struct swit anoyes[];   /* standard yes/no switches */
 
-#define ATTACHFORMATS 3        /* Number of send attach formats. */
-
 /*
 ** general folder attributes
 */
@@ -83,28 +81,25 @@ 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_UNSEEN (1<<2)    /* inc/show "unseen" */
+
+#define MBITS "\020\01EXISTS\02SELECTED\03UNSEEN"
 
 /*
-** first free slot for user defined sequences
-** and attributes
+** first free slot for user-defined sequences
 */
-#define FFATTRSLOT  5
+#define FFATTRSLOT  3
 
 /*
-** 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
@@ -176,9 +171,6 @@ struct msgs {
 #define unset_selected(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~SELECTED)
 #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 is_unseen(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] & SELECT_UNSEEN)
 #define unset_unseen(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~SELECT_UNSEEN)
 #define set_unseen(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] |= SELECT_UNSEEN)
@@ -244,7 +236,6 @@ struct msgs {
 #define MS_DEFAULT  0    /* default (one msg per file) */
 #define MS_UNKNOWN  1    /* type not known yet         */
 #define MS_MBOX     2    /* Unix-style "from" lines    */
-#define MS_MMDF     3    /* string mmdlm2              */
 
 extern int msg_count;        /* m_getfld() indicators */
 extern int msg_style;        /*  .. */
@@ -294,14 +285,14 @@ extern char *mailstore;      /* name of mail storage directory  */
 ** their values and reloading the various modules, nmh will run
 ** on any system.
 */
-extern char *buildmimeproc;
+extern char *attach_hdr;
 extern char *backup_prefix;
 extern char *altmsglink;
-extern char *catproc;
 extern char *components;
 extern char *context;
 extern char *curfolder;
 extern char *defaulteditor;
+extern char *defaultpager;
 extern char *defaultfolder;
 extern char *digestcomps;
 extern char *distcomps;
@@ -310,16 +301,16 @@ extern char *fileproc;
 extern char *foldprot;
 extern char *forwcomps;
 extern char *inbox;
-extern char *incproc;
-extern char *lproc;
+extern char *listproc;
 extern char *mhetcdir;
 extern char *mailproc;
+extern char *mailspool;
 extern char *mh_seq;
 extern char *mhlformat;
-extern char *mhlforward;
 extern char *mhlproc;
 extern char *mhlreply;
-extern char *moreproc;
+extern char *mimetypequery;
+extern char *mimetypequeryproc;
 extern char *msgprot;
 extern char *nmhaccessftp;
 extern char *nmhstorage;
@@ -330,6 +321,7 @@ extern char *postproc;
 extern char *profile;
 extern char *psequence;
 extern char *rcvdistcomps;
+extern char *rcvpackproc;
 extern char *rcvstoreproc;
 extern char *replcomps;
 extern char *replgroupcomps;