diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-06-16 11:55:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-16 11:55:40 +0200 |
commit | 4c3c04d03cc0cdbccfb71b534fc3cd238fd3974d (patch) | |
tree | 22e59e2f57c824369bd8d5f0d561f42303886229 /src/nvim/menu.c | |
parent | c990d65c37ded9ad9f4002a6eb6ec36aa29b4fe3 (diff) | |
parent | f419f914fc52fc86216b59e8ffa6fd510f79c6cd (diff) | |
download | rneovim-4c3c04d03cc0cdbccfb71b534fc3cd238fd3974d.tar.gz rneovim-4c3c04d03cc0cdbccfb71b534fc3cd238fd3974d.tar.bz2 rneovim-4c3c04d03cc0cdbccfb71b534fc3cd238fd3974d.zip |
Merge #8526 from janlazo/vim-8.0.0451
Diffstat (limited to 'src/nvim/menu.c')
-rw-r--r-- | src/nvim/menu.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/menu.c b/src/nvim/menu.c index 1bbd07686b..968962c894 100644 --- a/src/nvim/menu.c +++ b/src/nvim/menu.c @@ -97,7 +97,7 @@ ex_menu(exarg_T *eap) while (*arg != NUL && *arg != ' ') { if (*arg == '\\') STRMOVE(arg, arg + 1); - mb_ptr_adv(arg); + MB_PTR_ADV(arg); } if (*arg != NUL) { *arg++ = NUL; @@ -1099,7 +1099,7 @@ char_u *menu_name_skip(char_u *const name) { char_u *p; - for (p = name; *p && *p != '.'; mb_ptr_adv(p)) { + for (p = name; *p && *p != '.'; MB_PTR_ADV(p)) { if (*p == '\\' || *p == Ctrl_V) { STRMOVE(p, p + 1); if (*p == NUL) @@ -1549,9 +1549,11 @@ static void menu_unescape_name(char_u *name) { char_u *p; - for (p = name; *p && *p != '.'; mb_ptr_adv(p)) - if (*p == '\\') + for (p = name; *p && *p != '.'; MB_PTR_ADV(p)) { + if (*p == '\\') { STRMOVE(p, p + 1); + } + } } /* |