small fixes from Gero Treuner.

diff --git a/compose.c b/compose.c
index df006cd6087a852cf96b2d11a22666e4fab03399..e15519675a7038cd688778adfb3b95bdc8fd883f 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -37,7 +37,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#define CHECK_COUNT if (idxlen == 0) { mutt_error _("There are no attachments."); break; }
+static const char* There_are_no_attachments = N_("There are no attachments.");
+
+#define CHECK_COUNT if (idxlen == 0) { mutt_error _(There_are_no_attachments); break; }
 
 
 

diff --git a/mutt.h b/mutt.h
index 39f39c5d42ce3068180bc4556f34e98d0302dd91..87f0403feb76673535c4d33b33711aadf6d08eff 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -646,7 +646,6 @@ typedef struct
   unsigned int readonly : 1;    /* don't allow changes to the mailbox */
   unsigned int dontwrite : 1;   /* dont write the mailbox on close */
   unsigned int append : 1;     /* mailbox is opened in append mode */
-  unsigned int setgid : 1;
   unsigned int quiet : 1;      /* inhibit status messages? */
   unsigned int revsort : 1;    /* mailbox sorted in reverse? */
   unsigned int collapsed : 1;   /* are all threads collapsed? */

diff --git a/recvattach.c b/recvattach.c
index ed60b7777e585af2e4226d958d4a45ca58464e2d..120e050d44b325adc3a85bb3f656d962dacc11e1 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -945,10 +945,12 @@ mutt_attach_display_loop (MUTTMENU *menu, int op, FILE *fp, ATTACHPTR **idx)
 }
 
 
+static const char *Function_not_permitted = N_("Function not permitted in attach-message mode.");
+
 #define CHECK_ATTACH if(option(OPTATTACHMSG)) \
                     {\
                        mutt_flushinp (); \
-                       mutt_error ("Function not permitted in attach-message mode."); \
+                       mutt_error _(Function_not_permitted); \
                        break; \
                     }