I'm tired of that. madmutt needs a glibc, so what...

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

diff --git a/lib-ui/menu.c b/lib-ui/menu.c
index aa1501a..01f0ab8 100644 (file)
--- a/lib-ui/menu.c
+++ b/lib-ui/menu.c
@@ -117,7 +117,7 @@ static void print_enriched_string (int attr, unsigned char *s, int do_color)
       if (do_color)
         attrset (attr);
     }
-    else if ((k = mbrtowc (&wc, (char *) s, n, &mbstate)) > 0) {
+    else if ((k = mbrtowc (&wc, (char *) s, n, &mbstate)) != (size_t)-1) {
       addnstr ((char *) s, k);
       s += k, n -= k;
     }
@@ -142,10 +142,7 @@ static void menu_pad_string (char *s, size_t n)
   int cols;
   char *tmpbuf = p_new(char, n);
 
-  if (option (OPTMBOXPANE))
-    cols = COLS - shift - SidebarWidth;
-  else
-    cols = COLS - shift;
+  cols = COLS - SW - shift;
   mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, m_strlen(s), 1);
   tmpbuf[n - 1] = 0;
   snprintf (s, n, "%s", tmpbuf);        /* overkill */
@@ -397,7 +394,7 @@ void menu_check_recenter (MUTTMENU * menu)
 void menu_jump (MUTTMENU * menu)
 {
   int n;
-  char buf[SHORT_STRING];
+  char buf[STRING];
 
   if (menu->max) {
     mutt_ungetch (LastKey, 0);
@@ -667,7 +664,7 @@ static int menu_search (MUTTMENU * menu, int op)
   int r;
   int searchDir;
   regex_t re;
-  char buf[SHORT_STRING];
+  char buf[STRING];
 
   if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) {
     m_strcpy(buf, sizeof(buf), NONULL(menu->searchBuf));
@@ -987,10 +984,6 @@ int mutt_menuLoop (MUTTMENU * menu)
       mutt_what_key ();
       break;
 
-    case OP_REBUILD_CACHE:
-      mx_rebuild_cache ();
-      break;
-
     case OP_REDRAW:
       clearok (stdscr, TRUE);
       menu->redraw = REDRAW_FULL;