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.

1 files changed, 25 insertions, 25 deletions

diff --git a/flags.c b/flags.c
index f34b3755..26802651 100644
--- a/flags.c
+++ b/flags.c
@@ -33,14 +33,14 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
   int flagged = ctx->flagged;
   int update = 0;
 
-  if (ctx->readonly && flag != M_TAG)
+  if (ctx->readonly && flag != MUTT_TAG)
     return; /* don't modify anything if we are read-only */
 
   switch (flag)
   {
-    case M_DELETE:
+    case MUTT_DELETE:
 
-      if (!mutt_bit_isset(ctx->rights,M_ACL_DELETE))
+      if (!mutt_bit_isset(ctx->rights,MUTT_ACL_DELETE))
 	return;
 
       if (bf)
@@ -53,7 +53,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
 #ifdef USE_IMAP
           /* deleted messages aren't treated as changed elsewhere so that the
            * purge-on-sync option works correctly. This isn't applicable here */
-          if (ctx && ctx->magic == M_IMAP)
+          if (ctx && ctx->magic == MUTT_IMAP)
           {
             h->changed = 1;
 	    if (upd_ctx) ctx->changed = 1;
@@ -68,7 +68,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
 	if (upd_ctx) ctx->deleted--;
 #ifdef USE_IMAP
         /* see my comment above */
-	if (ctx->magic == M_IMAP) 
+	if (ctx->magic == MUTT_IMAP) 
 	{
 	  h->changed = 1;
 	  if (upd_ctx) ctx->changed = 1;
@@ -82,14 +82,14 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
 	 * is checked in specific code in the maildir folder
 	 * driver. 
 	 */
-	if (ctx->magic == M_MAILDIR && upd_ctx && h->trash)
+	if (ctx->magic == MUTT_MAILDIR && upd_ctx && h->trash)
 	  ctx->changed = 1;
       }
       break;
 
-    case M_NEW:
+    case MUTT_NEW:
 
-      if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
+      if (!mutt_bit_isset(ctx->rights,MUTT_ACL_SEEN))
 	return;
 
       if (bf)
@@ -120,9 +120,9 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
       }
       break;
 
-    case M_OLD:
+    case MUTT_OLD:
 
-      if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
+      if (!mutt_bit_isset(ctx->rights,MUTT_ACL_SEEN))
 	return;
 
       if (bf)
@@ -148,9 +148,9 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
       }
       break;
 
-    case M_READ:
+    case MUTT_READ:
 
-      if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
+      if (!mutt_bit_isset(ctx->rights,MUTT_ACL_SEEN))
 	return;
 
       if (bf)
@@ -178,9 +178,9 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
       }
       break;
 
-    case M_REPLIED:
+    case MUTT_REPLIED:
 
-      if (!mutt_bit_isset(ctx->rights,M_ACL_WRITE))
+      if (!mutt_bit_isset(ctx->rights,MUTT_ACL_WRITE))
 	return;
 
       if (bf)
@@ -209,9 +209,9 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
       }
       break;
 
-    case M_FLAG:
+    case MUTT_FLAG:
 
-      if (!mutt_bit_isset(ctx->rights,M_ACL_WRITE))
+      if (!mutt_bit_isset(ctx->rights,MUTT_ACL_WRITE))
 	return;
 
       if (bf)
@@ -235,7 +235,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
       }
       break;
 
-    case M_TAG:
+    case MUTT_TAG:
       if (bf)
       {
 	if (!h->tagged)
@@ -340,34 +340,34 @@ int mutt_change_flag (HEADER *h, int bf)
   {
     case 'd':
     case 'D':
-      flag = M_DELETE;
+      flag = MUTT_DELETE;
       break;
 
     case 'N':
     case 'n':
-      flag = M_NEW;
+      flag = MUTT_NEW;
       break;
 
     case 'o':
     case 'O':
       if (h)
-	mutt_set_flag (Context, h, M_READ, !bf);
+	mutt_set_flag (Context, h, MUTT_READ, !bf);
       else
-	mutt_tag_set_flag (M_READ, !bf);
-      flag = M_OLD;
+	mutt_tag_set_flag (MUTT_READ, !bf);
+      flag = MUTT_OLD;
       break;
 
     case 'r':
     case 'R':
-      flag = M_REPLIED;
+      flag = MUTT_REPLIED;
       break;
 
     case '*':
-      flag = M_TAG;
+      flag = MUTT_TAG;
       break;
 
     case '!':
-      flag = M_FLAG;
+      flag = MUTT_FLAG;
       break;
 
     default: