X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fmh.h;h=f3fda88083c4c4d9b42408e10880c83c568c6bb4;hp=52dc50496f1f74813922fbec7f7acc7705d199b1;hb=0347722f5b69de06a867b73ddc23388d082ab219;hpb=3baec236a39c5c89a9bda8dbd988d643a21decc6

diff --git a/h/mh.h b/h/mh.h
index 52dc504..f3fda88 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -154,55 +154,6 @@ struct msgs {
 */
 #define MSGSTATSIZE(mp,lo,hi) ((size_t) (((hi) - (lo) + 1) * sizeof(*(mp)->msgstats)))
 
-/*
-** macros for message and sequence manipulation
-*/
-#define clear_msg_flags(mp,msgnum) ((mp)->msgstats[(msgnum) - mp->lowoff] = 0)
-#define copy_msg_flags(mp,i,j) \
-    ((mp)->msgstats[(i) - mp->lowoff] = (mp)->msgstats[(j) - mp->lowoff])
-#define get_msg_flags(mp,ptr,msgnum)  (*(ptr) = (mp)->msgstats[(msgnum) - mp->lowoff])
-#define set_msg_flags(mp,ptr,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] = *(ptr))
-
-#define does_exist(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] & EXISTS)
-#define unset_exists(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~EXISTS)
-#define set_exists(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] |= EXISTS)
-
-#define is_selected(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] & SELECTED)
-#define unset_selected(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~SELECTED)
-#define set_selected(mp,msgnum)  ((mp)->msgstats[(msgnum) - mp->lowoff] |= SELECTED)
-
-#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)
-
-
-#define in_sequence(mp,seqnum,msgnum) \
-           ((mp)->msgstats[(msgnum) - mp->lowoff] & (1 << (FFATTRSLOT + seqnum)))
-#define clear_sequence(mp,seqnum,msgnum) \
-           ((mp)->msgstats[(msgnum) - mp->lowoff] &= ~(1 << (FFATTRSLOT + seqnum)))
-#define add_sequence(mp,seqnum,msgnum) \
-           ((mp)->msgstats[(msgnum) - mp->lowoff] |= (1 << (FFATTRSLOT + seqnum)))
-
-#define is_seq_private(mp,seqnum) \
-           ((mp)->attrstats & (1 << (FFATTRSLOT + seqnum)))
-#define make_seq_public(mp,seqnum) \
-           ((mp)->attrstats &= ~(1 << (FFATTRSLOT + seqnum)))
-#define make_seq_private(mp,seqnum) \
-           ((mp)->attrstats |= (1 << (FFATTRSLOT + seqnum)))
-#define make_all_public(mp) \
-           ((mp)->attrstats = 0)
-
-/*
-** macros for folder attributes
-*/
-#define clear_folder_flags(mp) ((mp)->msgflags = 0)
-
-#define is_readonly(mp)  ((mp)->msgflags & READONLY)
-#define set_readonly(mp)  ((mp)->msgflags |= READONLY)
-
-#define other_files(mp)  ((mp)->msgflags & OTHERS)
-#define set_other_files(mp)  ((mp)->msgflags |= OTHERS)
-
 #define NULLMP  ((struct msgs *) 0)
 
 /*
@@ -230,16 +181,7 @@ struct msgs {
 #define BODYEOF  4         /* Body  returned ending at eom     */
 #define FILEEOF  5         /* Reached end of input file        */
 
-/*
-** Maildrop styles
-*/
-#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    */
-
-extern int msg_count;        /* m_getfld() indicators */
-extern int msg_style;        /*  .. */
-extern char *msg_delim;      /*  .. */
+extern int msg_count;        /* m_getfld() indicators (That's a hack!) */
 
 #define NOUSE    0        /* draft being re-used */
 
@@ -259,10 +201,6 @@ extern char *msg_delim;      /*  .. */
 # define min(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
-#ifndef abs
-# define abs(a) ((a) > 0 ? (a) : -(a))
-#endif
-
 /*
 ** GLOBAL VARIABLES
 */
@@ -286,51 +224,37 @@ extern char *mailstore;      /* name of mail storage directory  */
 ** on any system.
 */
 extern char *attach_hdr;
-extern char *buildmimeproc;
-extern char *backup_prefix;
-extern char *altmsglink;
-extern char *catproc;
+extern char *sign_hdr;
+extern char *enc_hdr;
 extern char *components;
 extern char *context;
 extern char *curfolder;
 extern char *defaulteditor;
+extern char *defaultpager;
 extern char *defaultfolder;
 extern char *digestcomps;
 extern char *distcomps;
 extern char *draftfolder;
-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 *mimetypequery;
 extern char *mimetypequeryproc;
-extern char *moreproc;
 extern char *msgprot;
-extern char *nmhaccessftp;
 extern char *nmhstorage;
-extern char *nmhcache;
-extern char *nmhprivcache;
 extern char *nsequence;
-extern char *postproc;
 extern char *profile;
 extern char *psequence;
 extern char *rcvdistcomps;
-extern char *rcvstoreproc;
 extern char *replcomps;
 extern char *replgroupcomps;
-extern char *rmmproc;
 extern char *sendmail;
-extern char *sendproc;
 extern char *seq_all;
 extern char *seq_beyond;
 extern char *seq_cur;
@@ -340,8 +264,7 @@ extern char *seq_next;
 extern char *seq_prev;
 extern char *seq_unseen;
 extern char *seq_neg;
-extern char *showmimeproc;
-extern char *showproc;
+extern char *trashfolder;
 extern char *usequence;
 extern char *version_num;
 extern char *version_str;