2 files changed, 8 insertions, 6 deletions

diff --git a/ftplugin/text.vim b/ftplugin/text.vim
new file mode 100644
index 0000000..226de51
--- /dev/null
+++ b/ftplugin/text.vim
@@ -0,0 +1,2 @@
+" highlight double words (its unlikely they are right)
+autocmd InsertLeave * syntax match Convention /\v<(\w+)\_s+\1>/ containedin=ALL
diff --git a/vimrc-full b/vimrc-full
index 819222f..dfff12d 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -1043,7 +1043,6 @@ function! ExtendColorTheme()
   " highlight! link LightlineLeft_tabline_1 ColorColumn
   " highlight! link LightlineLeft_tabline_0_1 ColorColumn
 
-
   highlight! Todo guibg=#ffffaa guifg=#000000 gui=bold term=bold
   highlight! cStatement guifg=red gui=bold term=bold
 
@@ -1051,13 +1050,13 @@ function! ExtendColorTheme()
   autocmd InsertEnter * set list
   autocmd InsertLeave * set nolist
 
-  " highlight double words (its unlikely they are right)
-  autocmd InsertLeave * syntax match Convention /\v<(\w+)\_s+\1>/ containedin=ALL
-
   " Show trailing whitepace and spaces before a tab as part of the syntax highlighting
   highlight! link Convention Error
-  autocmd BufEnter,InsertLeave * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL
-  autocmd InsertEnter * syntax clear Convention
+  " autocmd BufEnter,InsertLeave * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL
+  " autocmd BufEnter,InsertLeave * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL
+  autocmd BufEnter,BufWritePost * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL
+  " TODO: faster strategy
+  " autocmd InsertEnter * syntax clear Convention
   " autocmd BufEnter,InsertLeave * execute ':syntax match Convention /\%>'.&textwidth.'v./ containedin=ALL'
 
   autocmd InsertEnter * set colorcolumn=80,120
@@ -1074,6 +1073,7 @@ set termguicolors | " When on, uses highlight-guifg and highlight-guibg attribut
 if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
   let g:base16_shell_path="~/.config/base16-shell/scripts"
   let base16colorspace=256
+  let syntax_cmd="skip" " vim internal, use base16 and no default colors
   set background=dark
   source ~/.vimrc_background
 else