msgwin: use msgwin_clear_text()

igor47 · Jun 4, 2021 · 7a5f94e · 7a5f94e
1 parent 49ad144
commit 7a5f94e
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/commands.c b/commands.c
@@ -501,12 +501,12 @@ void ci_bounce_message(struct Mailbox *m, struct EmailList *el)
   if (query_quadoption(c_bounce, prompt) != MUTT_YES)
   {
     mutt_addrlist_clear(&al);
-    mutt_window_clearline(MessageWindow, 0);
+    msgwin_clear_text();
     mutt_message(ngettext("Message not bounced", "Messages not bounced", msg_count));
     return;
   }
 
-  mutt_window_clearline(MessageWindow, 0);
+  msgwin_clear_text();
 
   struct Message *msg = NULL;
   STAILQ_FOREACH(en, el, entries)
@@ -925,7 +925,7 @@ bool mutt_shell_escape(void)
     return false;
   }
 
-  mutt_window_clearline(MessageWindow, 0);
+  msgwin_clear_text();
   mutt_endwin();
   fflush(stdout);
   int rc = mutt_system(buf);

diff --git a/flags.c b/flags.c
@@ -451,7 +451,7 @@ int mutt_change_flag(struct Mailbox *m, struct EmailList *el, bool bf)
     event = mutt_getch();
   } while (event.ch == -2); // Timeout
 
-  mutt_window_clearline(MessageWindow, 0);
+  msgwin_clear_text();
   window_set_focus(old_focus);
 
   if (event.ch < 0) // SIGINT, Abort key (Ctrl-G)

diff --git a/gui/curs_lib.c b/gui/curs_lib.c
@@ -548,7 +548,7 @@ enum QuadOption query_quadoption(enum QuadOption opt, const char *prompt)
 
     default:
       opt = mutt_yesorno(prompt, (opt == MUTT_ASKYES) ? MUTT_YES : MUTT_NO);
-      mutt_window_clearline(MessageWindow, 0);
+      msgwin_clear_text();
       return opt;
   }
 

diff --git a/index/index.c b/index/index.c
@@ -1369,7 +1369,7 @@ struct Mailbox *mutt_index_menu(struct MuttWindow *dlg, struct Mailbox *m_init)
         /* force a real complete redraw.  clrtobot() doesn't seem to be able
          * to handle every case without this.  */
         clearok(stdscr, true);
-        mutt_window_clearline(MessageWindow, 0);
+        msgwin_clear_text();
         continue;
       }
 
@@ -1380,7 +1380,7 @@ struct Mailbox *mutt_index_menu(struct MuttWindow *dlg, struct Mailbox *m_init)
       {
         mutt_timeout_hook();
         if (priv->tag)
-          mutt_window_clearline(MessageWindow, 0);
+          msgwin_clear_text();
         continue;
       }
 
@@ -1396,7 +1396,7 @@ struct Mailbox *mutt_index_menu(struct MuttWindow *dlg, struct Mailbox *m_init)
         if (priv->tag)
         {
           priv->tag = false;
-          mutt_window_clearline(MessageWindow, 0);
+          msgwin_clear_text();
           continue;
         }
 
@@ -2518,7 +2518,7 @@ struct Mailbox *mutt_index_menu(struct MuttWindow *dlg, struct Mailbox *m_init)
 
         if (mutt_buffer_is_empty(folderbuf))
         {
-          mutt_window_clearline(MessageWindow, 0);
+          msgwin_clear_text();
           goto changefoldercleanup;
         }
 
@@ -2594,7 +2594,7 @@ struct Mailbox *mutt_index_menu(struct MuttWindow *dlg, struct Mailbox *m_init)
 
         if (mutt_buffer_is_empty(folderbuf))
         {
-          mutt_window_clearline(MessageWindow, 0);
+          msgwin_clear_text();
           goto changefoldercleanup2;
         }
 

diff --git a/menu/menu.c b/menu/menu.c
@@ -333,7 +333,7 @@ int menu_loop(struct Menu *menu)
       if (menu->tagprefix)
       {
         menu->tagprefix = false;
-        mutt_window_clearline(MessageWindow, 0);
+        msgwin_clear_text();
         continue;
       }
 
@@ -369,7 +369,7 @@ int menu_loop(struct Menu *menu)
     if (op < 0)
     {
       if (menu->tagprefix)
-        mutt_window_clearline(MessageWindow, 0);
+        msgwin_clear_text();
       continue;
     }
 

diff --git a/mutt_logging.c b/mutt_logging.c
@@ -117,7 +117,7 @@ void mutt_clear_error(void)
 
   ErrorBufMessage = false;
   if (!OptNoCurses)
-    mutt_window_clearline(MessageWindow, 0);
+    msgwin_clear_text();
 }
 
 /**

diff --git a/muttlib.c b/muttlib.c
@@ -1448,7 +1448,7 @@ int mutt_save_confirm(const char *s, struct stat *st)
     }
   }
 
-  mutt_window_clearline(MessageWindow, 0);
+  msgwin_clear_text();
   return ret;
 }
 

diff --git a/pager/pager.c b/pager/pager.c
@@ -2633,7 +2633,7 @@ int mutt_pager(struct PagerView *pview)
       SigWinch = false;
       mutt_resize_screen();
       clearok(stdscr, true); /* force complete redraw */
-      mutt_window_clearline(MessageWindow, 0);
+      msgwin_clear_text();
 
       if (pview->flags & MUTT_PAGER_RETWINCH)
       {

diff --git a/recvattach.c b/recvattach.c
@@ -878,7 +878,7 @@ static void query_pipe_attachment(const char *command, FILE *fp, struct Body *bo
              _("WARNING!  You are about to overwrite %s, continue?"), body->filename);
     if (mutt_yesorno(warning, MUTT_NO) != MUTT_YES)
     {
-      mutt_window_clearline(MessageWindow, 0);
+      msgwin_clear_text();
       return;
     }
     mutt_mktemp(tfile, sizeof(tfile));

diff --git a/recvcmd.c b/recvcmd.c
@@ -250,12 +250,12 @@ void mutt_attach_bounce(struct Mailbox *m, FILE *fp, struct AttachCtx *actx, str
   const enum QuadOption c_bounce = cs_subset_quad(NeoMutt->sub, "bounce");
   if (query_quadoption(c_bounce, prompt) != MUTT_YES)
   {
-    mutt_window_clearline(MessageWindow, 0);
+    msgwin_clear_text();
     mutt_message(ngettext("Message not bounced", "Messages not bounced", p));
     goto end;
   }
 
-  mutt_window_clearline(MessageWindow, 0);
+  msgwin_clear_text();
 
   if (cur)
     ret = mutt_bounce_message(fp, m, cur->email, &al, NeoMutt->sub);
-Original file line number
+Diff line change
@@ Expand Up / @@ -1448,7 +1448,7 @@ int mutt_save_confirm(const char *s, struct stat *st) @@
         }
       }
-      mutt_window_clearline(MessageWindow, 0);
+      msgwin_clear_text();
       return ret;
     }
@@ Expand Down @@