1 files changed, 50 insertions, 44 deletions

diff --git a/vimrc-full b/vimrc-full
index e605d38..fac043b 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -166,49 +166,51 @@ nnoremap <F9> :TagbarToggle<CR>|                      " bind TagBar to Hotkey Ct
 set laststatus=2                                        | " required by AirLine, without status line does not appear until a window split
 set background=light                                    |
 
-Plug 'vim-airline/vim-airline'                          | " beautification of the mode line
-let g:airline_section_c                          = "%F" | " was: %F
-let g:airline_detect_modified                    = 1    |
-let g:airline_detect_paste                       = 0    |
-let g:airline_exclude_preview                    = 0    |
-let g:airline_inactive_collapse                  = 1    |
-let g:airline_powerline_fonts                    = 1    |
-let g:airline_skip_empty_sections                = 1    |
-" let g:airline_extensions                         = []   |
-
-let g:airline#extensions#tabline#enabled         = 1    |
-let g:airline#extensions#tabline#left_alt_sep    = ''   |
-let g:airline#extensions#tabline#left_sep        = ''   |
-let g:airline#extensions#tabline#right_alt_sep   = ''   |
-let g:airline#extensions#tabline#right_sep       = ''   |
-let g:airline#extensions#tabline#fnamemod        = ':t' | " let airline just show the filename without its path
-let g:airline#extensions#tabline#disable_refresh = 0    |
-let g:airline#extensions#tabline#enabled         = 1    |
-let g:airline#extensions#tabline#show_buffers    = 1    |
-let g:airline#extensions#tabline#show_tabs       = 0    |
-let g:airline#extensions#tabline#ignore_bufadd_pat = '\c\vgundo|undotree|vimfiler|tagbar|nerd_tree|preview|^$'
-
-let g:airline_extensions#branch#enabled          = 1    |
-let g:airline_extensions#whitespace#enabled      = 1    |
-let b:airline_whitespace_checks                  = ['indent', 'trailing', 'long', 'mixed-indent-file']
-
-if has('python')
-  let g:airline_extensions#syntastic#enabled     = 1    |
-  let g:airline_extensions#ycm#enabled           = 1    |
-endif
-
-let g:airline#extensions#tagbar#flags            = 'f'  | " even though the airline extension is off this controls :h tagbar-extend
-let g:airline#extensions#tagbar#enabled          = 0    |
-
-" AIRLINE_Theme:
-Plug 'vim-airline/vim-airline-themes'                   | " airline themes to match any light and dark terminal using :AirlineTheme
-let base16colorspace=256                                |
-let g:airline_theme='base16'                            | " specifies which colorscheme should airline uses
-let g:airline#themes#base16#constant             = 0    |
-" let g:solarized_base16 = 1
-" let g:airline_base16_improved_contrast = 1
-" let g:airline_theme='badcat'                       | " specifies which colorscheme should airline uses
-" let g:airline_theme='papercolor'                   | " specifies which colorscheme should ionirline uses
+Plug 'itchyny/lightline.vim'
+
+"    Plug 'vim-airline/vim-airline'                          | " beautification of the mode line
+"    let g:airline_section_c                          = "%F" | " was: %F
+"    let g:airline_detect_modified                    = 1    |
+"    let g:airline_detect_paste                       = 0    |
+"    let g:airline_exclude_preview                    = 0    |
+"    let g:airline_inactive_collapse                  = 1    |
+"    let g:airline_powerline_fonts                    = 1    |
+"    let g:airline_skip_empty_sections                = 1    |
+"    let g:airline_extensions                         = []   |
+"    
+"    let g:airline#extensions#tabline#enabled         = 1    |
+"    let g:airline#extensions#tabline#left_alt_sep    = ''   |
+"    let g:airline#extensions#tabline#left_sep        = ''   |
+"    let g:airline#extensions#tabline#right_alt_sep   = ''   |
+"    let g:airline#extensions#tabline#right_sep       = ''   |
+"    let g:airline#extensions#tabline#fnamemod        = ':t' | " let airline just show the filename without its path
+"    let g:airline#extensions#tabline#disable_refresh = 1    | " refresh airline on bufadd ?
+"    let g:airline#extensions#tabline#enabled         = 1    |
+"    let g:airline#extensions#tabline#show_buffers    = 1    |
+"    let g:airline#extensions#tabline#show_tabs       = 0    |
+"    let g:airline#extensions#tabline#ignore_bufadd_pat = '\c\vgundo|undotree|vimfiler|tagbar|nerd_tree|preview|^$'
+"    
+"    let g:airline_extensions#branch#enabled          = 1    |
+"    let g:airline_extensions#whitespace#enabled      = 0    | " airlines whitespace check is slow :/
+"    let b:airline_whitespace_checks                  = ['indent', 'trailing', 'long', 'mixed-indent-file']
+"    
+"    if has('python')
+"      let g:airline_extensions#syntastic#enabled     = 1    |
+"      let g:airline_extensions#ycm#enabled           = 1    |
+"    endif
+"    
+"    let g:airline#extensions#tagbar#flags            = 'f'  | " even though the airline extension is off this controls :h tagbar-extend
+"    let g:airline#extensions#tagbar#enabled          = 0    |
+"    
+"    " AIRLINE_Theme:
+"    Plug 'vim-airline/vim-airline-themes'                   | " airline themes to match any light and dark terminal using :AirlineTheme
+"    let base16colorspace=256                                |
+"    let g:airline_theme='base16'                            | " specifies which colorscheme should airline uses
+"    let g:airline#themes#base16#constant             = 0    |
+"    " let g:solarized_base16 = 1
+"    " let g:airline_base16_improved_contrast = 1
+"    " let g:airline_theme='badcat'                       | " specifies which colorscheme should airline uses
+"    " let g:airline_theme='papercolor'                   | " specifies which colorscheme should ionirline uses
 
 " Autocompleter: =====================================
 if has("python")
@@ -593,7 +595,7 @@ if has("autocmd")
     " autocmd BufEnter * @f
   augroup END
 
-  autocmd VimEnter * set nobuflisted
+  " autocmd VimEnter * set nobuflisted
 endif
 
 
@@ -659,6 +661,7 @@ let g:netrw_winsize       = 20      | " window size in percent
 
 
 highlight WordBold cterm=bold gui=bold
+let w:m1 = 0
 function! HighlightWordUnderCursor()
     if(exists('w:m1') && w:m1 > 0)
       call matchdelete(w:m1)
@@ -670,6 +673,9 @@ function! HighlightWordUnderCursor()
     endif
 endfunction
 autocmd! CursorHold,CursorHoldI * call HighlightWordUnderCursor()
+if version >= 702 " clean up (see: http://vim.wikia.com/wiki/VimTip396)
+  autocmd BufWinLeave * call clearmatches()
+endif
 
 " au BufNewFile,BufRead,BufEnter *.cpp,*.hpp set omnifunc=omni#cpp#complete#Main
 " Enable omni completion.