2 files changed, 10 insertions, 1 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index e2a5d38bee..81919c00d2 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1032,6 +1032,15 @@ void set_init_3(void)
     xfree(p);
   }
 
+  if (bufempty()) {
+    int idx_ffs = findoption((char_u *)"ffs");
+
+    // Apply the first entry of 'fileformats' to the initial buffer.
+    if (idx_ffs >= 0 && (options[idx_ffs].flags & P_WAS_SET)) {
+      set_fileformat(default_fileformat(), OPT_LOCAL);
+    }
+  }
+
   set_title_defaults();
 }
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0e572f78e0..5bcd5ee8e3 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -824,7 +824,7 @@ static int included_patches[] = {
   // 1622 NA
   // 1621 NA
   1620,
-  // 1619,
+  1619,
   // 1618 NA
   // 1617 NA
   // 1616 NA