X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=menu.c;h=5e46eed34aa5583681428899b28ba0e39c28b69c;hp=95bc43e627bdf930bf1b480e6f75b27efefffa6a;hb=0d5798fa40d68a2cff1193196b9c4ddd67da5063;hpb=cfd46a622a446af8a5fa286637cd88259f1b50a5 diff --git a/menu.c b/menu.c index 95bc43e..5e46eed 100644 --- a/menu.c +++ b/menu.c @@ -35,13 +35,10 @@ extern size_t UngetCount; static void print_enriched_string (int attr, unsigned char *s, int do_color) { - wchar_t wc; size_t k; size_t n = mutt_strlen ((char *)s); - mbstate_t mbstate; short f1, f2, b1, b2; - memset (&mbstate, 0, sizeof (mbstate)); while (*s) { if (*s < M_TREE_MAX) @@ -136,10 +133,10 @@ 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 (*s > 0) { - addnstr ((char *)s, k); - s += k, n-= k; + addnstr ((char *)s, 1); + s += 1, n-= 1; } else break;