From: Thomas Roessler <roessler@does-not-exist.org>
Date: Fri, 2 Oct 1998 09:38:06 +0000 (+0000)
Subject: With SLang, addstr() is a macro.  This means we should put
X-Git-Tag: mutt-0-94-9i-p1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6007032453d4c6c42a95fb5501f304df2eca208d;p=mutt

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 493d1860..032d5d3f 100644
--- 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 dc21b477..15482458 100644
--- 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 d4cda85d..e0863965 100644
--- 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 2cb51378..0e373332 100644
--- 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