Mercurial > vim

changeset 8659:72e2f387466f v7.4.1619

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/364fa5c7ec2a99a791c8f8b66fe70b0bf1dd9a41 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 20 17:53:25 2016 +0100 patch 7.4.1619 Problem: When 'fileformats' is set in the vimrc it applies to new buffers but not the initial buffer. Solution: Set 'fileformat' when starting up. (Mike Williams)
author Christian Brabandt <cb@256bit.org>
date Sun, 20 Mar 2016 18:00:05 +0100
parents 549a7dde4eb0
children f823d462c690
files src/option.c src/version.c
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,