diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-15 10:14:12 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-11-15 11:48:37 -0500 |
| commit | 9d9d93aee39202bc9d691c01a40338ed7bf6df2f (patch) | |
| tree | 2245524b65af8d285af31224416bee92542ff05e /src/nvim/option.c | |
| parent | 10c72cd3658e17aafa41b5752c23d97df88fc71f (diff) | |
| download | rneovim-9d9d93aee39202bc9d691c01a40338ed7bf6df2f.tar.gz rneovim-9d9d93aee39202bc9d691c01a40338ed7bf6df2f.tar.bz2 rneovim-9d9d93aee39202bc9d691c01a40338ed7bf6df2f.zip | |
vim-patch:7.4.2174
Problem: Adding duplicate flags to 'whichwrap' leaves commas behind.
Solution: Also remove the commas. (Naruhiko Nishino)
https://github.com/vim/vim/commit/c8ce615299b4d8c1b2e6cf83496f48cd497d8a37
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 3bd1ce217e..fc93e942ca 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1728,12 +1728,24 @@ do_set ( if (flags & P_FLAGLIST) { /* Remove flags that appear twice. */ - for (s = newval; *s; ++s) - if ((!(flags & P_COMMA) || *s != ',') - && vim_strchr(s + 1, *s) != NULL) { - STRMOVE(s, s + 1); - --s; + for (s = newval; *s; s++) { + // if options have P_FLAGLIST and P_ONECOMMA such as + // 'whichwrap' + if (flags & P_ONECOMMA) { + if (*s != ',' && *(s + 1) == ',' + && vim_strchr(s + 2, *s) != NULL) { + // Remove the duplicated value and the next comma. + STRMOVE(s, s + 2); + s -= 2; + } + } else { + if ((!(flags & P_COMMA) || *s != ',') + && vim_strchr(s + 1, *s) != NULL) { + STRMOVE(s, s + 1); + s--; + } } + } } if (save_arg != NULL) /* number for 'whichwrap' */ |