diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-11-14 00:02:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 00:02:29 -0800 |
| commit | e3b08a0fc43eef91b51f8166a036e86b5bdf5613 (patch) | |
| tree | aab224f640e8986e377c6d5a7615077f6b8d3f7d /src/nvim/ops.c | |
| parent | 570ee5f404966a6ffd9a5241d91adc6a9f5f2c9d (diff) | |
| parent | a0c18bf2017ac7d38d13014a810bda44d09dfcbb (diff) | |
| download | rneovim-e3b08a0fc43eef91b51f8166a036e86b5bdf5613.tar.gz rneovim-e3b08a0fc43eef91b51f8166a036e86b5bdf5613.tar.bz2 rneovim-e3b08a0fc43eef91b51f8166a036e86b5bdf5613.zip | |
Merge #11384 from janlazo/vim-8.1.2293
vim-patch:8.1.{927,2293}
Diffstat (limited to 'src/nvim/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 95674f8b40..2301b2159f 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -3773,7 +3773,10 @@ int do_join(size_t count, if (insert_space && t > 0) { curr = skipwhite(curr); - if (*curr != ')' && currsize != 0 && endcurr1 != TAB + if (*curr != NUL + && *curr != ')' + && currsize != 0 + && endcurr1 != TAB && (!has_format_option(FO_MBYTE_JOIN) || (utf_ptr2char(curr) < 0x100 && endcurr1 < 0x100)) && (!has_format_option(FO_MBYTE_JOIN2) |