diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2015-03-16 11:01:10 -0400 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2015-03-16 11:01:10 -0400 |
commit | 7d5e1db5865c3e19f5fa2051836039dfe620b3d0 (patch) | |
tree | 1f2540388d8e0dad31dbba0861493d435b6ce741 /src/nvim/fileio.c | |
parent | 08d2f7b5629f036273a6e04193374fdc10be18d7 (diff) | |
parent | 4fd8c3cbbbc14a1a8603dc0b3fe6dd08e0fc1631 (diff) | |
download | rneovim-7d5e1db5865c3e19f5fa2051836039dfe620b3d0.tar.gz rneovim-7d5e1db5865c3e19f5fa2051836039dfe620b3d0.tar.bz2 rneovim-7d5e1db5865c3e19f5fa2051836039dfe620b3d0.zip |
Merge #2157 'Minor cleanups'
Diffstat (limited to 'src/nvim/fileio.c')
-rw-r--r-- | src/nvim/fileio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index aab55bda77..9d4c990f3a 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1729,14 +1729,14 @@ failed: } } - if (set_options) - save_file_ff(curbuf); /* remember the current file format */ - - /* If editing a new file: set 'fenc' for the current buffer. - * Also for ":read ++edit file". */ - if (set_options) + if (set_options) { + // Remember the current file format. + save_file_ff(curbuf); + // If editing a new file: set 'fenc' for the current buffer. + // Also for ":read ++edit file". set_string_option_direct((char_u *)"fenc", -1, fenc, - OPT_FREE|OPT_LOCAL, 0); + OPT_FREE | OPT_LOCAL, 0); + } if (fenc_alloced) free(fenc); # ifdef USE_ICONV |