X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=8be7f8fd08d8c244423cff8d519e2eab1a19cd0a;hp=8e247187383ddf4c8667bef350811260dc8c4024;hb=b7a46c16244533f5c6a2d6964a4fbb591ccc5588;hpb=1951199b744b2104bf7fe60effe5dd0f455aee9c

diff --git a/commands.c b/commands.c
index 8e24718..8be7f8f 100644
--- a/commands.c
+++ b/commands.c
@@ -55,7 +55,7 @@ int mutt_display_message (HEADER * cur)
   mutt_parse_mime_message (Context, cur);
   mutt_message_hook (Context, cur, M_MESSAGEHOOK);
 
-  fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+  fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
   if (!fpout) {
     mutt_error _("Could not create temporary file!");
     return 0;
@@ -204,11 +204,11 @@ void ci_bounce_message (HEADER * h, int *redraw)
   buf[0] = 0;
   rfc822_addrcat(buf, sizeof (buf), adr, 1);
 
-#define extra_space (15 + 7 + 2)
   snprintf (prompt, sizeof (prompt),
             (h ? _("Bounce message to %s") : _("Bounce messages to %s")),
             buf);
 
+#define extra_space (15 + 7 + 2)
   if (m_strwidth(prompt) > COLS - extra_space) {
     mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
                        prompt, sizeof(prompt), 0);
@@ -216,6 +216,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   } else {
     m_strcat(prompt, sizeof(prompt), "?");
   }
+#undef extra_space
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
@@ -469,7 +470,7 @@ void mutt_shell_escape (void)
   buf[0] = 0;
   if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0) {
     if (!buf[0])
-      m_strcpy(buf, sizeof(buf), MCore.shell);
+      m_strcpy(buf, sizeof(buf), mod_core.shell);
     if (buf[0]) {
       CLEARLINE (LINES - 1);
       mutt_endwin (NULL);