With SLang, addstr() is a macro. This means we should put

additional braces around _()-style arguments.

diff --git a/browser.c b/browser.c
index 493d186046661793cf337dfc89ebc230c1434297..032d5d3fd08bf1dfc85441530d9f8d72c9ad1ae3 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -741,9 +741,9 @@ void mutt_select_file (char *f, size_t flen, int buffy)
          if (i == OP_SORT_REVERSE)
          {
            reverse = SORT_REVERSE;
-           addstr _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ");
+           addstr (_("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "));
          } else {
-           addstr _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ");
+           addstr (_("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "));
          }
          clrtoeol ();
 

diff --git a/curs_lib.c b/curs_lib.c
index dc21b4778877b56c9e42e73505891f86e3d08a54..154824581fe76332251fe87ef70d8ba5f34c78c9 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -300,7 +300,7 @@ int mutt_enter_fname (const char *prompt, char *buf, size_t blen, int *redraw, i
   int i;
 
   mvaddstr (LINES-1, 0, (char *) prompt);
-  addstr _(" ('?' for list): ");
+  addstr (_(" ('?' for list): "));
   if (buf[0])
     addstr (buf);
   clrtoeol ();

diff --git a/edit.c b/edit.c
index d4cda85d62c635d2c9350f2bcf8358ca4dd56e42..e086396577dab01fe496d3a89928620a0e55ee4f 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -309,7 +309,7 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur)
 
   be_edit_header (msg->env, 0);
 
-  addstr _("(End message with a . on a line by itself)\n");
+  addstr (_("(End message with a . on a line by itself)\n"));
 
   buf = be_snarf_file (path, buf, &bufmax, &buflen, 0);
 
@@ -336,7 +336,7 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur)
       switch (tmp[1])
       {
        case '?':
-         addstr _(EditorHelp);
+         addstr (_(EditorHelp));
          break;
        case 'b':
          msg->env->bcc = mutt_parse_adrlist (msg->env->bcc, p);
@@ -367,15 +367,15 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur)
                                       (isupper ((unsigned char) tmp[1])));
          }
          else
-           addstr _("No mailbox.\n");
+           addstr (_("No mailbox.\n"));
          break;
        case 'p':
          addstr ("-----\n");
-         addstr _("Message contains:\n");
+         addstr (_("Message contains:\n"));
          be_print_header (msg->env);
          for (i = 0; i < buflen; i++)
            addstr (buf[i]);
-         addstr _("(continue)\n");
+         addstr (_("(continue)\n"));
          break;
        case 'q':
          done = 1;
@@ -388,7 +388,7 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur)
            buf = be_snarf_file (tmp, buf, &bufmax, &buflen, 1);
           }
          else
-           addstr _("missing filename.\n");
+           addstr (_("missing filename.\n"));
          break;
        case 's':
          safe_free ((void **) &msg->env->subject);
@@ -409,7 +409,7 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur)
            continue;
          }
          else
-           addstr _("No lines in message.\n");
+           addstr (_("No lines in message.\n"));
          break;
 
        case 'e':
@@ -427,7 +427,7 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur)
 
            buf = be_snarf_file (path, buf, &bufmax, &buflen, 0);
 
-           addstr _("(continue)\n");
+           addstr (_("(continue)\n"));
          }
          break;
        case 'w':

diff --git a/mutt.h b/mutt.h
index 2cb513783e613f9d4c6984bdf493bb76b34c29d8..0e37333263579c9dca7078376a7cc2416f1da660 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -34,9 +34,9 @@
 
 #ifdef ENABLE_NLS
 # include <libintl.h>
-# define _(a) gettext (a)
+# define _(a) (gettext (a))
 # ifdef gettext_noop
-#  define N_(a) gettext_noop (a)
+#  define N_(a) (gettext_noop (a))
 # else
 #  define N_(a) (a)
 # endif