diff --git a/src/testdir/test_fileformat.vim b/src/testdir/test_fileformat.vim
index 9f90deb..efc3b22 100644
--- a/src/testdir/test_fileformat.vim
+++ b/src/testdir/test_fileformat.vim
@@ -281,9 +281,9 @@
 func Test_fileformat_plusplus_read()
   new
   call setline(1, ['one', 'two', 'three'])
-  set ff=unix
   w ++ff=dos Xfile1
   enew!
+  set ff=unix
   " A :read doesn't change the fileformat, but does apply to the read lines.
   r ++fileformat=unix Xfile1
   call assert_equal('unix', &fileformat)
diff --git a/src/version.c b/src/version.c
index 780330c..dc849eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    264,
+/**/
     263,
 /**/
     262,