mutt stable branch with some hacks

Fix header file indentation after M_ prefix renaming.

The use of tabs caused misalignment of various macro definitions.

+98 -98
+13 -13
copy.h
··· 17 17 */ 18 18 19 19 /* flags to _mutt_copy_message */ 20 - #define MUTT_CM_NOHEADER 1 /* don't copy the message header */ 21 - #define MUTT_CM_PREFIX (1<<1) /* quote the message */ 22 - #define MUTT_CM_DECODE (1<<2) /* decode the message body into text/plain */ 23 - #define MUTT_CM_DISPLAY (1<<3) /* output is displayed to the user */ 24 - #define MUTT_CM_UPDATE (1<<4) /* update structs on sync */ 25 - #define MUTT_CM_WEED (1<<5) /* weed message/rfc822 attachment headers */ 26 - #define MUTT_CM_CHARCONV (1<<6) /* perform character set conversions */ 27 - #define MUTT_CM_PRINTING (1<<7) /* printing the message - display light */ 28 - #define MUTT_CM_REPLYING (1<<8) /* replying the message */ 20 + #define MUTT_CM_NOHEADER 1 /* don't copy the message header */ 21 + #define MUTT_CM_PREFIX (1<<1) /* quote the message */ 22 + #define MUTT_CM_DECODE (1<<2) /* decode the message body into text/plain */ 23 + #define MUTT_CM_DISPLAY (1<<3) /* output is displayed to the user */ 24 + #define MUTT_CM_UPDATE (1<<4) /* update structs on sync */ 25 + #define MUTT_CM_WEED (1<<5) /* weed message/rfc822 attachment headers */ 26 + #define MUTT_CM_CHARCONV (1<<6) /* perform character set conversions */ 27 + #define MUTT_CM_PRINTING (1<<7) /* printing the message - display light */ 28 + #define MUTT_CM_REPLYING (1<<8) /* replying the message */ 29 29 30 - #define MUTT_CM_DECODE_PGP (1<<9) /* used for decoding PGP messages */ 31 - #define MUTT_CM_DECODE_SMIME (1<<10) /* used for decoding S/MIME messages */ 32 - #define MUTT_CM_DECODE_CRYPT (MUTT_CM_DECODE_PGP | MUTT_CM_DECODE_SMIME) 30 + #define MUTT_CM_DECODE_PGP (1<<9) /* used for decoding PGP messages */ 31 + #define MUTT_CM_DECODE_SMIME (1<<10) /* used for decoding S/MIME messages */ 32 + #define MUTT_CM_DECODE_CRYPT (MUTT_CM_DECODE_PGP | MUTT_CM_DECODE_SMIME) 33 33 34 - #define MUTT_CM_VERIFY (1<<11) /* do signature verification */ 34 + #define MUTT_CM_VERIFY (1<<11) /* do signature verification */ 35 35 36 36 /* flags for mutt_copy_header() */ 37 37 #define CH_UPDATE 1 /* update the status and x-status fields? */
+2 -2
group.h
··· 20 20 #ifndef _MUTT_GROUP_H_ 21 21 #define _MUTT_GROUP_H_ 1 22 22 23 - #define MUTT_GROUP 0 24 - #define MUTT_UNGROUP 1 23 + #define MUTT_GROUP 0 24 + #define MUTT_UNGROUP 1 25 25 26 26 void mutt_group_add_adrlist (group_t *g, ADDRESS *a); 27 27
+13 -13
mailbox.h
··· 20 20 #define _MAILBOX_H 21 21 22 22 /* flags for mutt_open_mailbox() */ 23 - #define MUTT_NOSORT (1<<0) /* do not sort the mailbox after opening it */ 24 - #define MUTT_APPEND (1<<1) /* open mailbox for appending messages */ 25 - #define MUTT_READONLY (1<<2) /* open in read-only mode */ 26 - #define MUTT_QUIET (1<<3) /* do not print any messages */ 27 - #define MUTT_NEWFOLDER (1<<4) /* create a new folder - same as MUTT_APPEND, but uses 28 - * safe_fopen() for mbox-style folders. 29 - */ 23 + #define MUTT_NOSORT (1<<0) /* do not sort the mailbox after opening it */ 24 + #define MUTT_APPEND (1<<1) /* open mailbox for appending messages */ 25 + #define MUTT_READONLY (1<<2) /* open in read-only mode */ 26 + #define MUTT_QUIET (1<<3) /* do not print any messages */ 27 + #define MUTT_NEWFOLDER (1<<4) /* create a new folder - same as MUTT_APPEND, but uses 28 + * safe_fopen() for mbox-style folders. 29 + */ 30 30 31 31 /* mx_open_new_message() */ 32 - #define MUTT_ADD_FROM (1<<0) /* add a From_ line */ 33 - #define MUTT_SET_DRAFT (1<<1) /* set the message draft flag */ 32 + #define MUTT_ADD_FROM (1<<0) /* add a From_ line */ 33 + #define MUTT_SET_DRAFT (1<<1) /* set the message draft flag */ 34 34 35 35 /* return values from mx_check_mailbox() */ 36 36 enum 37 37 { 38 - MUTT_NEW_MAIL = 1, /* new mail received in mailbox */ 39 - MUTT_LOCKED, /* couldn't lock the mailbox */ 40 - MUTT_REOPENED, /* mailbox was reopened */ 41 - MUTT_FLAGS /* nondestructive flags change (IMAP) */ 38 + MUTT_NEW_MAIL = 1, /* new mail received in mailbox */ 39 + MUTT_LOCKED, /* couldn't lock the mailbox */ 40 + MUTT_REOPENED, /* mailbox was reopened */ 41 + MUTT_FLAGS /* nondestructive flags change (IMAP) */ 42 42 }; 43 43 44 44 typedef struct _message
+55 -55
mutt.h
··· 90 90 #define MUTT_PATTERN (1<<7) /* pattern mode - only used for history classes */ 91 91 92 92 /* flags for mutt_get_token() */ 93 - #define MUTT_TOKEN_EQUAL 1 /* treat '=' as a special */ 94 - #define MUTT_TOKEN_CONDENSE (1<<1) /* ^(char) to control chars (macros) */ 95 - #define MUTT_TOKEN_SPACE (1<<2) /* don't treat whitespace as a term */ 96 - #define MUTT_TOKEN_QUOTE (1<<3) /* don't interpret quotes */ 97 - #define MUTT_TOKEN_PATTERN (1<<4) /* !)|~ are terms (for patterns) */ 98 - #define MUTT_TOKEN_COMMENT (1<<5) /* don't reap comments */ 99 - #define MUTT_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */ 93 + #define MUTT_TOKEN_EQUAL 1 /* treat '=' as a special */ 94 + #define MUTT_TOKEN_CONDENSE (1<<1) /* ^(char) to control chars (macros) */ 95 + #define MUTT_TOKEN_SPACE (1<<2) /* don't treat whitespace as a term */ 96 + #define MUTT_TOKEN_QUOTE (1<<3) /* don't interpret quotes */ 97 + #define MUTT_TOKEN_PATTERN (1<<4) /* !)|~ are terms (for patterns) */ 98 + #define MUTT_TOKEN_COMMENT (1<<5) /* don't reap comments */ 99 + #define MUTT_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */ 100 100 101 101 typedef struct 102 102 { ··· 118 118 /* flags for mutt_FormatString() */ 119 119 typedef enum 120 120 { 121 - MUTT_FORMAT_FORCESUBJ = (1<<0), /* print the subject even if unchanged */ 122 - MUTT_FORMAT_TREE = (1<<1), /* draw the thread tree */ 123 - MUTT_FORMAT_MAKEPRINT = (1<<2), /* make sure that all chars are printable */ 124 - MUTT_FORMAT_OPTIONAL = (1<<3), 125 - MUTT_FORMAT_STAT_FILE = (1<<4), /* used by mutt_attach_fmt */ 126 - MUTT_FORMAT_ARROWCURSOR = (1<<5), /* reserve space for arrow_cursor */ 127 - MUTT_FORMAT_INDEX = (1<<6), /* this is a main index entry */ 128 - MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */ 121 + MUTT_FORMAT_FORCESUBJ = (1<<0), /* print the subject even if unchanged */ 122 + MUTT_FORMAT_TREE = (1<<1), /* draw the thread tree */ 123 + MUTT_FORMAT_MAKEPRINT = (1<<2), /* make sure that all chars are printable */ 124 + MUTT_FORMAT_OPTIONAL = (1<<3), 125 + MUTT_FORMAT_STAT_FILE = (1<<4), /* used by mutt_attach_fmt */ 126 + MUTT_FORMAT_ARROWCURSOR = (1<<5), /* reserve space for arrow_cursor */ 127 + MUTT_FORMAT_INDEX = (1<<6), /* this is a main index entry */ 128 + MUTT_FORMAT_NOFILTER = (1<<7) /* do not allow filtering on this pass */ 129 129 } format_flag; 130 130 131 131 /* types for mutt_add_hook() */ 132 - #define MUTT_FOLDERHOOK 1 133 - #define MUTT_MBOXHOOK (1<<1) 134 - #define MUTT_SENDHOOK (1<<2) 135 - #define MUTT_FCCHOOK (1<<3) 136 - #define MUTT_SAVEHOOK (1<<4) 137 - #define MUTT_CHARSETHOOK (1<<5) 138 - #define MUTT_ICONVHOOK (1<<6) 139 - #define MUTT_MESSAGEHOOK (1<<7) 140 - #define MUTT_CRYPTHOOK (1<<8) 141 - #define MUTT_ACCOUNTHOOK (1<<9) 142 - #define MUTT_REPLYHOOK (1<<10) 143 - #define MUTT_SEND2HOOK (1<<11) 132 + #define MUTT_FOLDERHOOK 1 133 + #define MUTT_MBOXHOOK (1<<1) 134 + #define MUTT_SENDHOOK (1<<2) 135 + #define MUTT_FCCHOOK (1<<3) 136 + #define MUTT_SAVEHOOK (1<<4) 137 + #define MUTT_CHARSETHOOK (1<<5) 138 + #define MUTT_ICONVHOOK (1<<6) 139 + #define MUTT_MESSAGEHOOK (1<<7) 140 + #define MUTT_CRYPTHOOK (1<<8) 141 + #define MUTT_ACCOUNTHOOK (1<<9) 142 + #define MUTT_REPLYHOOK (1<<10) 143 + #define MUTT_SEND2HOOK (1<<11) 144 144 145 145 /* tree characters for linearize_tree and print_enriched_string */ 146 - #define MUTT_TREE_LLCORNER 1 147 - #define MUTT_TREE_ULCORNER 2 148 - #define MUTT_TREE_LTEE 3 149 - #define MUTT_TREE_HLINE 4 150 - #define MUTT_TREE_VLINE 5 151 - #define MUTT_TREE_SPACE 6 152 - #define MUTT_TREE_RARROW 7 153 - #define MUTT_TREE_STAR 8 154 - #define MUTT_TREE_HIDDEN 9 155 - #define MUTT_TREE_EQUALS 10 156 - #define MUTT_TREE_TTEE 11 157 - #define MUTT_TREE_BTEE 12 158 - #define MUTT_TREE_MISSING 13 159 - #define MUTT_TREE_MAX 14 146 + #define MUTT_TREE_LLCORNER 1 147 + #define MUTT_TREE_ULCORNER 2 148 + #define MUTT_TREE_LTEE 3 149 + #define MUTT_TREE_HLINE 4 150 + #define MUTT_TREE_VLINE 5 151 + #define MUTT_TREE_SPACE 6 152 + #define MUTT_TREE_RARROW 7 153 + #define MUTT_TREE_STAR 8 154 + #define MUTT_TREE_HIDDEN 9 155 + #define MUTT_TREE_EQUALS 10 156 + #define MUTT_TREE_TTEE 11 157 + #define MUTT_TREE_BTEE 12 158 + #define MUTT_TREE_MISSING 13 159 + #define MUTT_TREE_MAX 14 160 160 161 - #define MUTT_THREAD_COLLAPSE (1<<0) 162 - #define MUTT_THREAD_UNCOLLAPSE (1<<1) 163 - #define MUTT_THREAD_GET_HIDDEN (1<<2) 164 - #define MUTT_THREAD_UNREAD (1<<3) 165 - #define MUTT_THREAD_NEXT_UNREAD (1<<4) 161 + #define MUTT_THREAD_COLLAPSE (1<<0) 162 + #define MUTT_THREAD_UNCOLLAPSE (1<<1) 163 + #define MUTT_THREAD_GET_HIDDEN (1<<2) 164 + #define MUTT_THREAD_UNREAD (1<<3) 165 + #define MUTT_THREAD_NEXT_UNREAD (1<<4) 166 166 167 167 enum 168 168 { ··· 303 303 #define MUTT_COMPOSE_NOFREEHEADER (1<<0) 304 304 305 305 /* flags to _mutt_select_file() */ 306 - #define MUTT_SEL_BUFFY (1<<0) 307 - #define MUTT_SEL_MULTI (1<<1) 308 - #define MUTT_SEL_FOLDER (1<<2) 306 + #define MUTT_SEL_BUFFY (1<<0) 307 + #define MUTT_SEL_MULTI (1<<1) 308 + #define MUTT_SEL_FOLDER (1<<2) 309 309 310 310 /* flags for parse_spam_list */ 311 311 #define MUTT_SPAM 1 ··· 954 954 } ENTER_STATE; 955 955 956 956 /* flags for the STATE struct */ 957 - #define MUTT_DISPLAY (1<<0) /* output is displayed to the user */ 958 - #define MUTT_VERIFY (1<<1) /* perform signature verification */ 957 + #define MUTT_DISPLAY (1<<0) /* output is displayed to the user */ 958 + #define MUTT_VERIFY (1<<1) /* perform signature verification */ 959 959 #define MUTT_PENDINGPREFIX (1<<2) /* prefix to write, but character must follow */ 960 960 #define MUTT_WEED (1<<3) /* weed headers even when not in display mode */ 961 - #define MUTT_CHARCONV (1<<4) /* Do character set conversions */ 962 - #define MUTT_PRINTING (1<<5) /* are we printing? - MUTT_DISPLAY "light" */ 963 - #define MUTT_REPLYING (1<<6) /* are we replying? */ 964 - #define MUTT_FIRSTDONE (1<<7) /* the first attachment has been done */ 961 + #define MUTT_CHARCONV (1<<4) /* Do character set conversions */ 962 + #define MUTT_PRINTING (1<<5) /* are we printing? - MUTT_DISPLAY "light" */ 963 + #define MUTT_REPLYING (1<<6) /* are we replying? */ 964 + #define MUTT_FIRSTDONE (1<<7) /* the first attachment has been done */ 965 965 966 966 #define state_set_prefix(s) ((s)->flags |= MUTT_PENDINGPREFIX) 967 967 #define state_reset_prefix(s) ((s)->flags &= ~MUTT_PENDINGPREFIX)
+2 -2
mutt_curses.h
··· 138 138 struct color_line *next; 139 139 } COLOR_LINE; 140 140 141 - #define MUTT_PROGRESS_SIZE (1<<0) /* traffic-based progress */ 142 - #define MUTT_PROGRESS_MSG (1<<1) /* message-based progress */ 141 + #define MUTT_PROGRESS_SIZE (1<<0) /* traffic-based progress */ 142 + #define MUTT_PROGRESS_MSG (1<<1) /* message-based progress */ 143 143 144 144 typedef struct 145 145 {
+13 -13
pager.h
··· 19 19 #include "attach.h" 20 20 21 21 /* dynamic internal flags */ 22 - #define MUTT_SHOWFLAT (1<<0) 23 - #define MUTT_SHOWCOLOR (1<<1) 24 - #define MUTT_HIDE (1<<2) 25 - #define MUTT_SEARCH (1<<3) 26 - #define MUTT_TYPES (1<<4) 27 - #define MUTT_SHOW (MUTT_SHOWCOLOR | MUTT_SHOWFLAT) 22 + #define MUTT_SHOWFLAT (1<<0) 23 + #define MUTT_SHOWCOLOR (1<<1) 24 + #define MUTT_HIDE (1<<2) 25 + #define MUTT_SEARCH (1<<3) 26 + #define MUTT_TYPES (1<<4) 27 + #define MUTT_SHOW (MUTT_SHOWCOLOR | MUTT_SHOWFLAT) 28 28 29 29 /* exported flags for mutt_(do_)?pager */ 30 - #define MUTT_PAGER_NSKIP (1<<5) /* preserve whitespace with smartwrap */ 31 - #define MUTT_PAGER_MARKER (1<<6) /* use markers if option is set */ 32 - #define MUTT_PAGER_RETWINCH (1<<7) /* need reformatting on SIGWINCH */ 33 - #define MUTT_PAGER_MESSAGE (MUTT_SHOWCOLOR | MUTT_PAGER_MARKER) 34 - #define MUTT_PAGER_ATTACHMENT (1<<8) 35 - #define MUTT_PAGER_NOWRAP (1<<9) /* format for term width, ignore $wrap */ 30 + #define MUTT_PAGER_NSKIP (1<<5) /* preserve whitespace with smartwrap */ 31 + #define MUTT_PAGER_MARKER (1<<6) /* use markers if option is set */ 32 + #define MUTT_PAGER_RETWINCH (1<<7) /* need reformatting on SIGWINCH */ 33 + #define MUTT_PAGER_MESSAGE (MUTT_SHOWCOLOR | MUTT_PAGER_MARKER) 34 + #define MUTT_PAGER_ATTACHMENT (1<<8) 35 + #define MUTT_PAGER_NOWRAP (1<<9) /* format for term width, ignore $wrap */ 36 36 37 - #define MUTT_DISPLAYFLAGS (MUTT_SHOW | MUTT_PAGER_NSKIP | MUTT_PAGER_MARKER) 37 + #define MUTT_DISPLAYFLAGS (MUTT_SHOW | MUTT_PAGER_NSKIP | MUTT_PAGER_MARKER) 38 38 39 39 typedef struct 40 40 {