From 427833b553ddf8e1848a1c0d490727d482158ed0 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 23 Nov 2021 16:26:34 +0900 Subject: neovim/vim: fix statusline --- .config/nvim/init.lua | 5 +++-- .vimrc | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index b73bd4e..4544fab 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1257,8 +1257,9 @@ function vimrc.statusline.fenc_ff(bufnr) if fenc == '' then local fencs = vim.fn.split(vim.o.fileencodings, ',') fenc = fencs[1] or vim.o.encoding - elseif fenc == 'utf-8' then - fenc = bom and 'U8[BOM]' or 'U8' + end + if fenc == 'utf-8' then + fenc = bom == 1 and 'U8[BOM]' or 'U8' elseif fenc == 'utf-16' then fenc = 'U16[BE]' elseif fenc == 'utf-16le' then diff --git a/.vimrc b/.vimrc index 13e49c5..a4a5b85 100644 --- a/.vimrc +++ b/.vimrc @@ -1315,7 +1315,8 @@ function! s:statusline_fenc_ff(bufnr) abort if fenc ==# '' let fencs = split(&fileencodings, ',') let fenc = get(fencs, 0, &encoding) - elseif fenc ==# 'utf-8' + endif + if fenc ==# 'utf-8' let fenc = bom ? 'U8[BOM]' : 'U8' elseif fenc ==# 'utf-16' let fenc = 'U16[BE]' -- cgit v1.2.3-70-g09d2