zlogout: clean up logic, dont act without data

[dotfiles.git] / etc / vim / .vimrc

diff --git a/etc/vim/.vimrc b/etc/vim/.vimrc
index 6ad6135c2e2c3b31a228038e093b91ba970a8479..04521a64e5abf84f4aacdf9fa0667a52644c256b 100644 (file)
--- a/etc/vim/.vimrc
+++ b/etc/vim/.vimrc
@@ -77,10 +77,10 @@ autocmd VimEnter,WinNew * set cursorline
 
 " unique highlighting for leading spaces and in-line spaces
 " NOTE: this leaves tabs and other special whitespace untouched intentionally
-autocmd VimEnter,ColorScheme * highlight Space ctermfg=Grey guifg=#686868
-autocmd VimEnter,ColorScheme * highlight link SpaceLeading NonText
-autocmd VimEnter,WinNew * match Space / /
-autocmd VimEnter,WinNew * 2match SpaceLeading /\(^ \+\)\|\( \+$\)/
+autocmd VimEnter,ColorScheme * highlight SpaceInner ctermfg=Grey guifg=#686868
+autocmd VimEnter,ColorScheme * highlight link SpaceOuter NonText
+autocmd VimEnter,WinNew * match SpaceInner / /
+autocmd VimEnter,WinNew * 2match SpaceOuter /\(^ \+\)\|\( \+$\)/
 
 " always show statusline
 set laststatus=2
@@ -117,6 +117,11 @@ set listchars=tab:├─,extends:»,precedes:«,space:·,trail:∙,nbsp:■
 " always save undo file for all file buffers
 autocmd BufRead * set undofile
 
+" explicitly use modeline, even on systems where it's disabled by system vimrc
+autocmd BufRead set modeline
+" should be default disabled but just in case
+set nomodelineexpr
+
 "" indent
 " always use shiftwidth instead of tabsize
 set smarttab