diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-15 14:57:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 14:57:57 -0500 |
| commit | c91e9c1c7af48ad55a19a77b34fcabe6029fd956 (patch) | |
| tree | 894220772bbfb8e882bff5a2e617640efd656329 /src/nvim/option.c | |
| parent | c69cfd7d1c12fa895961289c7b2fcbeccff5a739 (diff) | |
| parent | 12ed735719547a48aa4628c37dc5e18ac40852b5 (diff) | |
| download | rneovim-c91e9c1c7af48ad55a19a77b34fcabe6029fd956.tar.gz rneovim-c91e9c1c7af48ad55a19a77b34fcabe6029fd956.tar.bz2 rneovim-c91e9c1c7af48ad55a19a77b34fcabe6029fd956.zip | |
Merge pull request #5611 from jamessan/vim-7.4.2174
vim-patch:7.4.2174
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 3bd1ce217e..0f95974cb4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1727,13 +1727,25 @@ 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; + // Remove flags that appear twice. + 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' */ |