diff options
author | David Bürgin <676c7473@gmail.com> | 2015-05-01 15:25:48 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2015-05-25 16:29:00 -0400 |
commit | 44175224ccc75e8feaf2fab594abf957024f79b8 (patch) | |
tree | 63982aa72f57a072628afd6ab24387c4e94e2449 /src/nvim/ops.c | |
parent | 297973ab00155048a627e8bf72ff4b14d71a6a01 (diff) | |
download | rneovim-44175224ccc75e8feaf2fab594abf957024f79b8.tar.gz rneovim-44175224ccc75e8feaf2fab594abf957024f79b8.tar.bz2 rneovim-44175224ccc75e8feaf2fab594abf957024f79b8.zip |
'cpoptions': Remove "j" flag
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); |