diff --git a/src/change.c b/src/change.c
index 04712144ac..bfcb6ccda7 100644
--- a/src/change.c
+++ b/src/change.c
@@ -1388,6 +1388,9 @@ open_line(
     char_u	*p;
     int		saved_char = NUL;	// init for GCC
     pos_T	*pos;
+#ifdef FEAT_CINDENT
+    int		do_cindent;
+#endif
 #ifdef FEAT_SMARTINDENT
     int		do_si = (!p_paste && curbuf->b_p_si
 # ifdef FEAT_CINDENT
@@ -1397,9 +1400,6 @@ open_line(
 					&& *curbuf->b_p_inde == NUL
 # endif
 			);
-#ifdef FEAT_CINDENT
-    int		do_cindent;
-#endif
     int		no_si = FALSE;		// reset did_si afterwards
     int		first_char = NUL;	// init for GCC
 #endif
diff --git a/src/version.c b/src/version.c
index ec9ac322bc..c5e42883ae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3791,
 /**/
     3790,
 /**/