From ea76123fc059c42775c5341c1a4a7e45e9e7e330 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Maciej=20=C5=81aszcz?= <trisiak@gmail.com>
Date: Wed, 19 Dec 2012 16:25:08 +0100
Subject: [PATCH] Small config and highlightning changes

---
 .vimrc             | 60 +++++++++++++++++++++++++++++++++++++-----------------
 colors/ambient.vim |  3 ++-
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/.vimrc b/.vimrc
index 0bb17d7..d8489e9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -68,6 +68,14 @@ if match($TERM, "screen") != -1
     map! OF <End>
 endif
 
+"if $TERM == tmux:
+"   let &t_SI="\<Esc>Ptmux;\<Esc>\<Esc>]12;orange\x7\<Esc>\\"
+"   let &t_EI="\<Esc>Ptmux;\<Esc>\<Esc>]12;green\x7\<Esc>\\"
+
+imap <C-@> <C-Space>
+
+inoremap <C-Space> <C-X><C-U>
+
 set lcs=tab:\|\ ,trail:x
 
 filetype plugin indent on
@@ -90,7 +98,6 @@ set title
 set guioptions=agirt
 set t_Co=256
 
-
 """" }}}
 """" {{{ AUTOCOMMANDS, FUNCTIONS AND HIGHLIGHTING
 if v:progname =~! "vi" && !exists(":DiffOrig")
@@ -114,18 +121,21 @@ augroup vimrcEx
                 \   exe "normal! g`\"" |
                 \ endif
 
-augroup END
 
 
-command! -nargs=+ -complete=file Cpplint lexpr system("cpplint.py --filter=-whitespace/tab,-whitespace/braces " . <q-args>)
+    au FileType cpp,c setl cursorline nu
+    au FileType cpp,c :HighlightTags
 
-au FileType cpp,c setl cursorline
-au FileType cpp,c :HighlightTags
+    au BufEnter *.cpp,*.c,*.C let b:fswitchdst = 'h,hpp,hh,H,hxx'
+    au BufEnter *.hpp,*.h,*.hh,*.hxx let b:fswitchdst = 'cpp,cxx,c,cc'
 
-au BufEnter *.cpp,*.c,*.C let b:fswitchdst = 'h,hpp,hh,H,hxx'
-au BufEnter *.hpp,*.h,*.hh,*.hxx let b:fswitchdst = 'cpp,cxx,c,cc'
+    au FileType text setlocal textwidth=78
 
-au FileType text setlocal textwidth=78
+    " au InsertLeave,InsertEnter * setl cursorline!
+augroup END
+
+
+command! -nargs=+ -complete=file Cpplint lexpr system("cpplint.py --filter=-whitespace/tab,-whitespace/braces " . <q-args>)
 
 " {{{ foldtext settings
 set foldtext=GenFoldText()
@@ -265,6 +275,9 @@ else
 	hi link StatusLineFnNC StatusLineNC
 	hi link StatusLineFlagsNC StatusLineNC
 endif
+        hi link VertSplit StatusLine
+        hi VertSplit cterm=NONE
+
 endfunction "}}}
 
 fun! StatusLineRealSyn() "{{{
@@ -334,9 +347,10 @@ nmap <Leader>w :w<CR>
 
 augroup MakeSpaceMap
 	au! MakeSpaceMap
-	au FileType c,cpp,prolog,erlang,haskell nmap <buffer> <silent> <Leader><Space> :w<CR>:silent make!<CR>:redraw!<CR>
-	au FileType tex,latex		nmap <buffer> <silent> <Leader><Space> :MakeLatex<CR>:silent ShowErrors<CR>
-        au FileType python  nmap <buffer> <silent> <Leader><Space> :!python %<CR>
+	au   FileType         prolog,erlang,haskell   nmap   <buffer><silent>  <Leader><Space>   :w<CR>:silent make!<CR>:redraw!<CR>
+	au   FileType                         c,cpp   nmap   <buffer><silent>  <Leader><Space>   :call g:ClangUpdateQuickFix()<CR>
+	au   FileType                     tex,latex   nmap   <buffer><silent>  <Leader><Space>   :MakeLatex<CR>:silent ShowErrors<CR>
+	au   FileType                        python   nmap   <buffer><silent>  <Leader><Space>   :!python %<CR>
 augroup END
 
 nmap <Leader>T2 :set ts=2<CR>
@@ -409,8 +423,8 @@ let g:easytags_by_filetype="~/tags/"
 let g:easytags_dynamic_files=1
 
 let g:easytags_on_cursorhold=1
-let g:easytags_updatetime_min=300
-"let g:easytags_updatetime_autodisable=1
+let g:easytags_updatetime_min=4000
+let g:easytags_updatetime_autodisable=1
 let g:easytags_include_members=1
 let g:easytags_resolve_links=1
 
@@ -532,13 +546,21 @@ let g:miniBufExplModSelTarget = 1
 let g:miniBufExplMaxSize = 1
 "let g:miniBufExplorerMoreThanOne = 1
 
-" hi MBEVisibleActive
-" hi MBEVisibleChangedActive 
-" hi MBEVisibleChanged
-" hi MBEVisibleNormal
-" hi MBEChanged
-" hi MBENormal
+hi link MBEVisibleChanged Boolean
+hi link MBEVisibleNormal Boolean
+
+hi link MBEVisibleActive String
+hi link MBEVisibleChangedActive String
+
+hi link MBENormal Comment
+hi link MBEChanged Comment
 
+" MBENormal      xxx links to Comment
+" MBEChanged     xxx links to String
+" MBEVisibleNormal xxx links to Special
+" MBEVisibleChanged xxx links to Special
+" MBEVisibleActive xxx links to Boolean
+" MBEVisibleChangedActive xxx links to Error
 "
 " NERD commenter
 "
diff --git a/colors/ambient.vim b/colors/ambient.vim
index d18809a..9a7e815 100644
--- a/colors/ambient.vim
+++ b/colors/ambient.vim
@@ -16,7 +16,8 @@ let g:colors_name = "ambient"
 
 " Vim >= 7.0 specific colors
 if version >= 700
-  hi CursorLine guibg=#3c3c3c ctermbg=237 cterm=none
+  hi CursorLine guibg=#3c3c3c ctermbg=235 cterm=none
+  hi CursorLineNr term=bold ctermfg=11 gui=bold guifg=Yellow cterm=underline
   hi CursorColumn guibg=#3c3c3c ctermbg=237
   hi MatchParen guifg=#e69c0d ctermfg=178 guibg=#3c3c3c ctermbg=237 gui=bold cterm=bold
   hi Pmenu 		guifg=#ffffff ctermfg=15 guibg=#4c4c4c ctermbg=239
-- 
2.11.4.GIT