diff options
author | Derek Martin <code@pizzashack.org> | 2016-05-09 14:06:54 -0700 |
---|---|---|
committer | Derek Martin <code@pizzashack.org> | 2016-05-09 14:06:54 -0700 |
commit | 9cafb05c0efadc771197c0e1e98fa9d989b48d41 (patch) | |
tree | c70f969ad76a417ec896f10ecccd17ca0702c8ef /editmsg.c | |
parent | fa0dcb09fe69d23ceba28159e6be6b72adb9a9df (diff) |
Change M_* symbols to MUTT_*
Changeset 23334e967dd7 created a workaround for a namespace conflict
with Solaris and derivatives. After some discussion, the team decided
it would be best to move away from using the "M_" prefix for macros.
This patch was automatically generated by running:
perl -wpi -e 's/\bM_(\w+)\b/MUTT_$1/g' `find . -name '*.[ch]' -print`
with the exception that sys_socket.h was exempted. (That file will
be backed out subsequent to this commit.)
Thanks to Andras Salamon for supplying the perl script used to make
this change.
Diffstat (limited to 'editmsg.c')
-rw-r--r-- | editmsg.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -67,9 +67,9 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur) mutt_mktemp (tmp, sizeof (tmp)); omagic = DefaultMagic; - DefaultMagic = M_MBOX; + DefaultMagic = MUTT_MBOX; - rc = (mx_open_mailbox (tmp, M_NEWFOLDER, &tmpctx) == NULL) ? -1 : 0; + rc = (mx_open_mailbox (tmp, MUTT_NEWFOLDER, &tmpctx) == NULL) ? -1 : 0; DefaultMagic = omagic; @@ -80,7 +80,7 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur) } rc = mutt_append_message (&tmpctx, ctx, cur, 0, CH_NOLEN | - ((ctx->magic == M_MBOX || ctx->magic == M_MMDF) ? 0 : CH_NOSTATUS)); + ((ctx->magic == MUTT_MBOX || ctx->magic == MUTT_MMDF) ? 0 : CH_NOSTATUS)); oerrno = errno; mx_close_mailbox (&tmpctx, NULL); @@ -143,7 +143,7 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur) goto bail; } - if (mx_open_mailbox (ctx->path, M_APPEND, &tmpctx) == NULL) + if (mx_open_mailbox (ctx->path, MUTT_APPEND, &tmpctx) == NULL) { rc = -1; /* L10N: %s is from strerror(errno) */ @@ -152,15 +152,15 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur) } of = 0; - cf = ((tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF) ? 0 : CH_NOSTATUS); + cf = ((tmpctx.magic == MUTT_MBOX || tmpctx.magic == MUTT_MMDF) ? 0 : CH_NOSTATUS); if (fgets (buff, sizeof (buff), fp) && is_from (buff, NULL, 0, NULL)) { - if (tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF) + if (tmpctx.magic == MUTT_MBOX || tmpctx.magic == MUTT_MMDF) cf = CH_FROM | CH_FORCE_FROM; } else - of = M_ADD_FROM; + of = MUTT_ADD_FROM; /* * XXX - we have to play games with the message flags to avoid @@ -199,11 +199,11 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur) if (rc == 0) { - mutt_set_flag (Context, cur, M_DELETE, 1); - mutt_set_flag (Context, cur, M_READ, 1); + mutt_set_flag (Context, cur, MUTT_DELETE, 1); + mutt_set_flag (Context, cur, MUTT_READ, 1); if (option (OPTDELETEUNTAG)) - mutt_set_flag (Context, cur, M_TAG, 0); + mutt_set_flag (Context, cur, MUTT_TAG, 0); } else if (rc == -1) mutt_message (_("Error. Preserving temporary file: %s"), tmp); |