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/option.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/option.c')
| -rw-r--r-- | src/nvim/option.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index e65798e57a..0851e6cc5f 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2830,7 +2830,7 @@ did_set_string_option ( for (s = p_sbr; *s; ) { if (ptr2cells(s) != 1) errmsg = (char_u *)N_("E595: contains unprintable or wide character"); - mb_ptr_adv(s); + MB_PTR_ADV(s); } } @@ -6209,13 +6209,15 @@ void ExpandOldSetting(int *num_file, char_u ***file) #ifdef BACKSLASH_IN_FILENAME /* For MS-Windows et al. we don't double backslashes at the start and * before a file name character. */ - for (var = buf; *var != NUL; mb_ptr_adv(var)) + for (var = buf; *var != NUL; MB_PTR_ADV(var)) { if (var[0] == '\\' && var[1] == '\\' && expand_option_idx >= 0 && (options[expand_option_idx].flags & P_EXPAND) && vim_isfilec(var[2]) - && (var[2] != '\\' || (var == buf && var[4] != '\\'))) + && (var[2] != '\\' || (var == buf && var[4] != '\\'))) { STRMOVE(var, var + 1); + } + } #endif *file[0] = buf; @@ -6383,9 +6385,10 @@ static void langmap_set(void) for (p = p_langmap; p[0] != NUL; ) { for (p2 = p; p2[0] != NUL && p2[0] != ',' && p2[0] != ';'; - mb_ptr_adv(p2)) { - if (p2[0] == '\\' && p2[1] != NUL) - ++p2; + MB_PTR_ADV(p2)) { + if (p2[0] == '\\' && p2[1] != NUL) { + p2++; + } } if (p2[0] == ';') ++p2; /* abcd;ABCD form, p2 points to A */ @@ -6401,7 +6404,7 @@ static void langmap_set(void) from = (*mb_ptr2char)(p); to = NUL; if (p2 == NULL) { - mb_ptr_adv(p); + MB_PTR_ADV(p); if (p[0] != ',') { if (p[0] == '\\') ++p; @@ -6427,10 +6430,10 @@ static void langmap_set(void) langmap_mapchar[from & 255] = (char_u)to; } - /* Advance to next pair */ - mb_ptr_adv(p); + // Advance to next pair + MB_PTR_ADV(p); if (p2 != NULL) { - mb_ptr_adv(p2); + MB_PTR_ADV(p2); if (*p == ';') { p = p2; if (p[0] != NUL) { |