diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
index 3565c530e..920473ddb 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -1439,4 +1439,18 @@ func Test_z_substitute_expr_leak()
   delfunc SubExpr
 endfunc
 
+func Test_substitute_expr_switch_win()
+  func R()
+    wincmd x
+    return 'XXXX'
+  endfunc
+  new Xfoobar
+  let bufnr = bufnr('%')
+  put ="abcdef"
+  silent! s/\%')/\=R()
+  call assert_fails(':%s/./\=R()/g', 'E565')
+  delfunc R
+  exe bufnr .. "bw!"
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index db11876b3..f2ffa40db 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1877,
 /**/
     1876,
 /**/