Merge branch 'master' into nohook

[apps/madmutt.git] / lib-ui / menu.c

diff --git a/lib-ui/menu.c b/lib-ui/menu.c
index 7015ca1..dc53571 100644 (file)
--- a/lib-ui/menu.c
+++ b/lib-ui/menu.c
@@ -9,14 +9,12 @@
 
 #include <lib-ui/lib-ui.h>
 
-#include "enter.h"
 #include "menu.h"
 
 #include "mutt.h"
 #include "charset.h"
 
 #include <imap/imap.h>
-#include <lib-ui/sidebar.h>
 
 extern size_t UngetCount;
 
@@ -112,10 +110,7 @@ static void menu_pad_string (char *s, size_t n)
 void menu_redraw_full (MUTTMENU * menu)
 {
   SETCOLOR(main_w, MT_COLOR_NORMAL);
-  /* wclear() doesn't optimize screen redraws */
-  wmove (main_w, 0, 0);
-  wclrtobot (main_w);
-
+  werase(main_w);
   SETCOLOR(main_w, MT_COLOR_SIDEBAR);
   mvwhline(main_w, LINES - 2, 0, ACS_HLINE, getmaxx(main_w));
   SETCOLOR(main_w, MT_COLOR_NORMAL);
@@ -841,10 +836,6 @@ int mutt_menuLoop (MUTTMENU * menu)
       MAYBE_REDRAW (menu->redraw);
       break;
 
-    case OP_WHAT_KEY:
-      mutt_what_key ();
-      break;
-
     case OP_REDRAW:
       clearok (main_w, TRUE);
       menu->redraw = REDRAW_FULL;