diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-07-23 10:05:51 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-07-23 10:05:51 +0800 |
| commit | 31c018244daa12caab3af357a368279a1f55d28c (patch) | |
| tree | 1527bfa5f8338ba6b669c3e5597c8028214c0bcd /src/nvim/option.c | |
| parent | 2c89195afdce9c66c875801753523f561ed5e4ca (diff) | |
| parent | 253f6f3bbfd16b7aeb2f72714c1d5d1c88a3478a (diff) | |
| download | rneovim-31c018244daa12caab3af357a368279a1f55d28c.tar.gz rneovim-31c018244daa12caab3af357a368279a1f55d28c.tar.bz2 rneovim-31c018244daa12caab3af357a368279a1f55d28c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 40fae18aaf..75b56b4eb4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -5718,7 +5718,22 @@ void buf_copy_options(buf_T *buf, int flags) free_buf_options(buf, TRUE); buf->b_p_ro = FALSE; /* don't copy readonly */ buf->b_p_fenc = vim_strsave(p_fenc); - buf->b_p_ff = vim_strsave(p_ff); + switch (*p_ffs) { + case 'm': + buf->b_p_ff = vim_strsave((char_u *)FF_MAC); + break; + case 'd': + buf->b_p_ff = vim_strsave((char_u *)FF_DOS); + break; + case 'u': + buf->b_p_ff = vim_strsave((char_u *)FF_UNIX); + break; + default: + buf->b_p_ff = vim_strsave(p_ff); + } + if (buf->b_p_ff != NULL) { + buf->b_start_ffc = *buf->b_p_ff; + } buf->b_p_bh = empty_option; buf->b_p_bt = empty_option; } else |