From 1614a14901558ca091329315d14a7d5e1b53aa47 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 6 Oct 2019 22:00:13 +0200 Subject: patch 8.1.2120: some MB_ macros are more complicated than necessary Problem: Some MB_ macros are more complicated than necessary. (Dominique Pelle) Solution: Simplify the macros. Expand inline. --- src/popupmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/popupmenu.c') diff --git a/src/popupmenu.c b/src/popupmenu.c index 846dbc264..b88c6531c 100644 --- a/src/popupmenu.c +++ b/src/popupmenu.c @@ -1151,7 +1151,7 @@ split_message(char_u *mesg, pumitem_T **array) } } item->cells += ptr2cells(p); - p += MB_PTR2LEN(p); + p += mb_ptr2len(p); } item->bytelen = p - item->start; if (item->cells > max_cells) @@ -1195,7 +1195,7 @@ split_message(char_u *mesg, pumitem_T **array) { cells = item->indent * 2; for (p = item->start + skip; p < item->start + item->bytelen; - p += MB_PTR2LEN(p)) + p += mb_ptr2len(p)) if ((cells += ptr2cells(p)) > BALLOON_MIN_WIDTH) break; thislen = p - (item->start + skip); -- cgit v1.2.1