diff --git a/src/edit.c b/src/edit.c
index 46b496ba45..b0e6f45d12 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3448,11 +3448,16 @@ ins_compl_prep(c)
 	    }
 	    else
 	    {
+		int prev_col = curwin->w_cursor.col;
+
 		/* put the cursor on the last char, for 'tw' formatting */
-		curwin->w_cursor.col--;
+		if (prev_col > 0)
+		    dec_cursor();
 		if (stop_arrow() == OK)
 		    insertchar(NUL, 0, -1);
-		curwin->w_cursor.col++;
+		if (prev_col > 0
+			     && ml_get_curline()[curwin->w_cursor.col] != NUL)
+		    inc_cursor();
 	    }
 
 	    auto_format(FALSE, TRUE);
diff --git a/src/version.c b/src/version.c
index 7f2739b234..42138ca9b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    199,
 /**/
     198,
 /**/