X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fstatus.c;h=3da31d9b0ea359a7f024557abd6c9b4cafe424f4;hb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d;hp=28b13294d3dce8dd737d7c45a1580791edf1321b;hpb=74697a5c38af6a85ce3b0062d781c35814a9f536;p=apps%2Fmadmutt.git diff --git a/lib-ui/status.c b/lib-ui/status.c index 28b1329..3da31d9 100644 --- a/lib-ui/status.c +++ b/lib-ui/status.c @@ -11,10 +11,10 @@ #include #include +#include #include "mutt.h" #include "sort.h" -#include "mx.h" #include "buffy.h" #define SW (option(OPTMBOXPANE)?SidebarWidth:0) @@ -52,7 +52,7 @@ static const char *status_format_str (char *buf, ssize_t buflen, char op, const char *elsestring, unsigned long data, format_flag flags) { - char fmt[SHORT_STRING], tmp[SHORT_STRING]; + char fmt[STRING], tmp[STRING]; const char *cp, *p; int count, optional = (flags & M_FORMAT_OPTIONAL); MUTTMENU *menu = (MUTTMENU *) data; @@ -293,7 +293,7 @@ void menu_status_line (char* buf, ssize_t len, MUTTMENU* menu, const char* p) { * only to not wrap past end of screen */ int width = COLS - SW; - mutt_FormatString (buf, (width >= len ? len : (width + 1)), + m_strformat (buf, (width >= len ? len : (width + 1)), p, status_format_str, (unsigned long) menu, 0); }