dotfiles

commit eecd085169dec8d6c7db6fe2c8dad3c487f51e65
parent 64e276ee64c724bf60544cc0e4c70a8d45137cee
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Thu, 25 Jun 2020 13:53:48 +0200

vim: remove statusline whitespace warning, handled by autocmd

Former-commit-id: 7dbaad9d29b9ce00e4878ef6cc634c2604aea24b
Diffstat:
M
vim/plugin/statusline.vim
 | 
5
++---
M
vim/vimrc
 | 
2
+-

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/vim/plugin/statusline.vim b/vim/plugin/statusline.vim
@@ -16,7 +16,6 @@ set statusline+=\ 〉%*                                                " Separat
 set statusline+=%(\ %m%r%w\ %)                                        " Flags (modified, readonly, help, preview). don't show if empty.
 set statusline+=%#error#                                              " Start error highlighting
 set statusline+=%(%{statusline#StatuslineTabWarning()}%)              " Inconsistent indentation warning
-set statusline+=%(%{statusline#StatuslineTrailingSpaceWarning()}%)    " Trailing whitespace warning
 set statusline+=%*                                                    " Clear highlighting
 set statusline+=%=                                                    " Move everything after this to the right
 set statusline+=%<                                                    " Start truncating here
@@ -24,9 +23,10 @@ set statusline+=\ %{statusline#StatuslineBuildCwd()}\                 " Current 
 set statusline+=%#statuslinefile#                                     " Highlight same as filename
 set statusline+=%(\ %{&spell?'📖\ ':''}%)                             " Show spellcheck status
 set statusline+=%(\ %{statusline#StatuslineVimtexCompiler()}%)        " Vimtex compiler status
-set statusline+=%(\ %y\ \|%)                                                  " File type
+set statusline+=%(\ %y\ \|%)                                          " File type
 set statusline+=\ %{&expandtab?'⤻':'⥅'}\                              " Using spaces or tabs
 set statusline+=%{statusline#StatuslineSpacesUsed()}                  " Spaces in a tab
+set statusline+=%(\ \|\ %{&paste?'📋':''}%)                           " Is paste set?
 set statusline+=\ \|\ %{statusline#StatuslineWrapCol()}\              " Textwidth/wrapmargin info
 set statusline+=\ %#statuslinenormmode#                               " Highlight same as normal mode indicator
 set statusline+=\ [%{statusline#StatuslineFoldmethod()}]              " The current foldlevel
@@ -37,7 +37,6 @@ augroup statusline
   " recalculate the tab/trailing whitespace warning flags when idle and after writing
   autocmd!
   autocmd cursorhold,bufwritepost * unlet! b:statusline_tab_warning
-  autocmd cursorhold,bufwritepost * unlet! b:statusline_trailing_space_warning
 augroup END
 
 command! StatuslineWCAdd setlocal statusline+=%{statusline#StatuslineWordCount()}
diff --git a/vim/vimrc b/vim/vimrc
@@ -416,7 +416,7 @@ let g:medieval_langs = ['python=python3', 'ruby', 'sh', 'bash', 'haskell=ghci', 
 " LF {{{3
 nmap <leader>\ <Plug>LfEdit
 nmap <leader><c-\> <Plug>LfSplit
-" Ada {{3
+" Ada {{{3
 let g:ada_standard_types = 1
 let g:ada_space_errors = 1
 let g:ada_begin_preproc = 1