diff --git a/src/move.c b/src/move.c
index 484b931ab..d340f0223 100644
--- a/src/move.c
+++ b/src/move.c
@@ -988,7 +988,9 @@ curs_columns(
 	/* long line wrapping, adjust curwin->w_wrow */
 	if (curwin->w_wcol >= curwin->w_width)
 	{
+#ifdef FEAT_LINEBREAK
 	    char_u *sbr;
+#endif
 
 	    /* this same formula is used in validate_cursor_col() */
 	    n = (curwin->w_wcol - curwin->w_width) / width + 1;
diff --git a/src/version.c b/src/version.c
index d8eedea52..64efb6ebd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2284,
 /**/
     2283,
 /**/