Now truly: Removed the unused variable mhlforward.

[mmh] / h / mh.h

diff --git a/h/mh.h b/h/mh.h
index 0c0d81f..23b340a 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -65,17 +65,15 @@ struct swit {
 
 extern struct swit anoyes[];   /* standard yes/no switches */
 
-#define ATTACHFORMATS 3        /* Number of send attach formats. */
-
 /*
 ** 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 +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,10 +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)
@@ -245,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;        /*  .. */
@@ -295,34 +285,33 @@ extern char *mailstore;      /* name of mail storage directory  */
 ** their values and reloading the various modules, nmh will run
 ** on any system.
 */
+extern char *attach_hdr;
 extern char *buildmimeproc;
 extern char *backup_prefix;
 extern char *altmsglink;
-extern char *catproc;
 extern char *components;
 extern char *context;
 extern char *curfolder;
-extern char *current;
 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 *mailspool;
 extern char *mh_seq;
 extern char *mhlformat;
-extern char *mhlforward;
 extern char *mhlproc;
 extern char *mhlreply;
+extern char *mimetypequery;
+extern char *mimetypequeryproc;
 extern char *moreproc;
 extern char *msgprot;
 extern char *nmhaccessftp;
@@ -330,7 +319,6 @@ extern char *nmhstorage;
 extern char *nmhcache;
 extern char *nmhprivcache;
 extern char *nsequence;
-extern char *packproc;
 extern char *postproc;
 extern char *profile;
 extern char *psequence;
@@ -338,10 +326,18 @@ 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;