diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2020-02-16 23:18:24 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-16 23:18:24 -0800 |
commit | 03f245c0b810fa2ff980bd3bf2530d94fd0f05d3 (patch) | |
tree | dbbd77ecb94314d118f0a9a9a001d33ba1b74053 /src/nvim/option.c | |
parent | 0c5d2ffebe92e710ca57d4e3f0b0789ccc369660 (diff) | |
parent | 1ce4b3c9a7420227c3ecffab782cb8da732998f5 (diff) | |
download | rneovim-03f245c0b810fa2ff980bd3bf2530d94fd0f05d3.tar.gz rneovim-03f245c0b810fa2ff980bd3bf2530d94fd0f05d3.tar.bz2 rneovim-03f245c0b810fa2ff980bd3bf2530d94fd0f05d3.zip |
Merge #11873 from janlazo/vim-8.1.0786
vim-patch:8.0.1660,8.1.{43,786,1201,2129,2131,2187,2223,2259},8.2.{241,267}
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r-- | src/nvim/option.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 100902897a..478c9a0ff8 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -7294,12 +7294,13 @@ int get_fileformat(buf_T *buf) /// argument. /// /// @param eap can be NULL! -int get_fileformat_force(buf_T *buf, exarg_T *eap) +int get_fileformat_force(const buf_T *buf, const exarg_T *eap) + FUNC_ATTR_NONNULL_ARG(1) { int c; if (eap != NULL && eap->force_ff != 0) { - c = eap->cmd[eap->force_ff]; + c = eap->force_ff; } else { if ((eap != NULL && eap->force_bin != 0) ? (eap->force_bin == FORCE_BIN) : buf->b_p_bin) { |