diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index 7639885584..c377a95737 100644
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -1504,6 +1504,7 @@ endfunc
 func Test_foldtextresult_rightleft()
   CheckFeature rightleft
 
+  let save_columns = &columns
   new
   set columns=70
   setlocal rightleft
@@ -1519,6 +1520,7 @@ func Test_foldtextresult_rightleft()
   call assert_equal('+--  2 lines: ' .. multibyte, foldtextresult(1))
 
   bw!
+  let &columns = save_columns
 endfunc
 
 " Test for merging two recursive folds when an intermediate line with no fold
diff --git a/src/version.c b/src/version.c
index 6e02d540a9..a3c72bdd2a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2108,
 /**/
     2107,
 /**/