diff --git a/src/terminal.c b/src/terminal.c
index 69b3306a41..a65fc00701 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -225,8 +225,8 @@ set_term_and_win_size(term_T *term)
 	 * at the command line and scroll up as needed, using tl_toprow. */
 	term->tl_rows = Rows;
 	term->tl_cols = Columns;
+	return;
     }
-    else
 #endif
     if (*curwin->w_p_tms != NUL)
     {
diff --git a/src/version.c b/src/version.c
index 9f1075e8ff..2890f7135b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1684,
 /**/
     1683,
 /**/