Disable many "stupid" CLI options or some that will have better equivalents soon...

[apps/madmutt.git] / recvcmd.c

diff --git a/recvcmd.c b/recvcmd.c
index 1f46204..d3059ff 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -163,9 +163,9 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
             buf);
 
 #define extra_space (15+7+2)
-  if (m_strwidth(prompt) > COLS - extra_space) {
-    mutt_format_string (prompt, sizeof (prompt) - 4,
-                        0, COLS - extra_space, 0, 0,
+  if (m_strwidth(prompt) > getmaxx(main_w) - extra_space) {
+    mutt_format_string (prompt, sizeof (prompt) - 4, 0,
+                        getmaxx(main_w) - extra_space, 0, 0,
                         prompt, sizeof (prompt), 0);
     m_strcat(prompt, sizeof(prompt), "...?");
   } else {
@@ -175,12 +175,12 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
-    CLEARLINE (LINES - 1);
+    CLEARLINE(main_w, LINES - 1);
     mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
     return;
   }
 
-  CLEARLINE (LINES - 1);
+  CLEARLINE(main_w, LINES - 1);
 
   if (cur)
     ret = mutt_bounce_message (fp, cur->hdr, adr);