summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/option.c9
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 616f9a303..8a706afbd 100644
--- a/src/option.c
+++ b/src/option.c
@@ -4017,6 +4017,15 @@ set_init_3(void)
}
#endif
+ 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);
+ }
+
#ifdef FEAT_TITLE
set_title_defaults();
#endif
diff --git a/src/version.c b/src/version.c
index 03a30812c..9136583df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1619,
+/**/
1618,
/**/
1617,