diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-05-25 16:30:17 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-05-25 16:30:17 -0400 |
| commit | a7b5ae37a71dae93f86da3003bf267fc4f4490f0 (patch) | |
| tree | e9b0aba5a26f1cf543ba266aabd9edb0911d7c54 /src/nvim/ops.c | |
| parent | 297973ab00155048a627e8bf72ff4b14d71a6a01 (diff) | |
| parent | e4c3ac1f82ea69777e1dcbfeb18a42c572c54d8f (diff) | |
| download | rneovim-a7b5ae37a71dae93f86da3003bf267fc4f4490f0.tar.gz rneovim-a7b5ae37a71dae93f86da3003bf267fc4f4490f0.tar.bz2 rneovim-a7b5ae37a71dae93f86da3003bf267fc4f4490f0.zip | |
Merge #2555 Remove "j" flag from 'cpoptions'
Diffstat (limited to 'src/nvim/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index dfc41d5685..0b95dd4642 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -3460,12 +3460,10 @@ int do_join(long count, endcurr1 = endcurr2; else ++spaces[t]; - /* extra space when 'joinspaces' set and line ends in '.' */ - if ( p_js - && (endcurr1 == '.' - || (vim_strchr(p_cpo, CPO_JOINSP) == NULL - && (endcurr1 == '?' || endcurr1 == '!')))) + // Extra space when 'joinspaces' set and line ends in '.', '?', or '!'. + if (p_js && (endcurr1 == '.' || endcurr1 == '?' || endcurr1 == '!')) { ++spaces[t]; + } } } currsize = (int)STRLEN(curr); |