commit cc184cfb09161b3bbc7d5d8859a18e812367d19c
author Bram Moolenaar <Bram@vim.org> Tue Nov 12 20:31:20 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Nov 12 20:31:20 2019 +0100
tree f4c2c860ec034a3466ca89968bd8d8f5b50d99e2
parent d002e411c60a231b7c136a84422b3d9bf7b8b4df

patch 8.1.2293: join adds trailing space when second line is empty

Problem:    Join adds trailing space when second line is empty. (Brennan
            Vincent)
Solution:   Do not add a trailing space.

src/ops.c

diff --git a/src/ops.c b/src/ops.c
index 85e99f7..258b271 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1999,7 +1999,8 @@
 	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)
 			|| (mb_ptr2char(curr) < 0x100 && endcurr1 < 0x100))
 		    && (!has_format_option(FO_MBYTE_JOIN2)