summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--colors/zlg.vim13
-rw-r--r--vimrc11
2 files changed, 13 insertions, 11 deletions
diff --git a/colors/zlg.vim b/colors/zlg.vim
index 49fc086..4d0fb72 100644
--- a/colors/zlg.vim
+++ b/colors/zlg.vim
@@ -23,9 +23,9 @@ hi TabLineSel cterm=bold,inverse ctermbg=blue ctermfg=white
hi TabLineFill cterm=NONE ctermbg=darkblue ctermfg=NONE
" Line numbers should be just-visible, not bright.
-hi LineNr ctermfg=magenta cterm=NONE ctermbg=darkgray gui=NONE guifg=#a99c7f guibg=#292012
-hi Visual ctermfg=NONE cterm=inverse ctermbg=black gui=inverse guifg=NONE guibg=#000000
-hi VisualNOS ctermfg=NONE cterm=inverse ctermbg=black gui=inverse guifg=NONE guibg=#000000
+hi LineNr ctermfg=blue cterm=NONE ctermbg=black gui=NONE guifg=#a99c7f guibg=#292012
+hi Visual ctermfg=NONE cterm=inverse ctermbg=black gui=inverse guifg=NONE guibg=#000000
+hi VisualNOS ctermfg=NONE cterm=inverse ctermbg=black gui=inverse guifg=NONE guibg=#000000
" My splits should not be bright
hi VertSplit cterm=NONE ctermfg=blue ctermbg=NONE gui=bold guifg=#000000 guibg=#1f4e6e
@@ -43,11 +43,11 @@ hi Error cterm=NONE ctermfg=white ctermbg=red gui=bold
hi Function cterm=NONE ctermfg=yellow ctermbg=NONE gui=bold guifg=#ffff00 guibg=NONE
hi Include cterm=NONE ctermfg=darkyellow ctermbg=NONE gui=NONE guifg=#d7c667 guibg=NONE
hi Macro cterm=NONE ctermfg=darkmagenta ctermbg=NONE gui=NONE guifg=#8a67ac guibg=NONE
-hi NonText cterm=NONE ctermfg=darkgray ctermbg=NONE gui=NONE guifg=#333333 guibg=NONE
+hi NonText cterm=NONE ctermfg=black ctermbg=NONE gui=NONE guifg=#333333 guibg=NONE
hi Normal cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=#071013
hi PreProc cterm=NONE ctermfg=magenta ctermbg=NONE gui=bold guifg=#a249a2 guibg=NONE
hi Search cterm=inverse ctermfg=yellow ctermbg=NONE gui=NONE guifg=#000000 guibg=#ffff00
-hi SpecialKey cterm=NONE ctermfg=darkgray ctermbg=NONE gui=NONE guifg=#333333 guibg=NONE
+hi SpecialKey cterm=NONE ctermfg=blue ctermbg=NONE gui=NONE guifg=#333333 guibg=NONE
hi SpecialChar cterm=NONE ctermfg=red ctermbg=NONE gui=bold guifg=#dd5500 guibg=NONE
hi Statement cterm=NONE ctermfg=white ctermbg=NONE gui=NONE guifg=#999999 guibg=NONE
hi String cterm=NONE ctermfg=darkcyan ctermbg=NONE gui=NONE guifg=#568cd1 guibg=NONE
@@ -76,4 +76,7 @@ hi link phpParent Normal
hi Title cterm=bold ctermfg=white ctermbg=NONE gui=bold guifg=#ffffff guibg=NONE
" }}}
+hi link Trailing Error
+syn match Trailing /\s\+$/
+
" vim: fdm=marker
diff --git a/vimrc b/vimrc
index cff34ab..059fee7 100644
--- a/vimrc
+++ b/vimrc
@@ -44,12 +44,11 @@ set mouse=n
" Interface {{{1
set display+=lastline
set list
-"set listchars=tab:⇥\ ,trail:␣,extends:⇉,precedes:⇇,nbsp:⚭,eol:¬
-if &listchars ==# 'eol:$'
- set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
- if &termencoding ==# 'utf-8' || &encoding ==# 'utf-8'
- let &listchars = "tab:\u21e5 ,trail:\u2423,extends:\u21c9,precedes:\u21c7,nbsp:\u26ad,eol:\u00ac"
- endif
+"set listchars=tab:⇥\ ,trail:␣,extends:⇉,precedes:⇇,nbsp:⚭
+if &termencoding ==# 'utf-8' || &encoding ==# 'utf-8'
+ let &listchars = "tab:\u21e5 ,extends:\u21c9,precedes:\u21c7,nbsp:\u26ad"
+else
+ set listchars=tab:>\ ,extends:>,precedes:<,nbsp:+
endif
set splitright
set splitbelow