Merge branch 'master' of bitbucket.org:vishap/scripts

vim/vimrc

@@ -199,7 +199,7 @@ endif
 if exists('+spell') && !&diff
     set spell
     highlight clear SpellBad
-    highlight SpellBad cterm=underline ctermfg=red
+    highlight SpellBad cterm=underline ctermfg=red gui=undercurl guisp=Red
 endif
 " Show 80th column.
 if exists('+colorcolumn')
@@ -375,15 +375,6 @@ let $GREP_OPTIONS.=' --exclude-dir=llcalc* --exclude-dir=00*'
 "let $GREP_OPTIONS.=' --include Makefile'
 map af :execute "grep! ".expand("<cword>")." -r ." <Bar> cw<CR>
 
-"
-" Loads CF5Compile
-" Compile and run file if Ctrl-F5 is pressed.
-"
-if !exists('*CF5Compile')
-    runtime plugin/cf5-compiler.vim
-endif
-map <silent> a4 :call CF5CompileOnly()<CR>
-map <silent> a5 :call CF5CompileAndRun()<CR>
 "
 " CTRL-U in insert mode deletes a lot.  Use CTRL-G u to first break undo,
 " so that you can undo CTRL-U after inserting a line break.
@@ -430,34 +421,12 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     "
     "   Adds nice status and tabline.
     "
-    Plugin 'bling/vim-airline'
+    Plugin 'vim-airline/vim-airline'
+    "Plugin 'vim-airline/vim-airline-themes'
     let g:airline#extensions#tabline#enabled = 1
     let g:airline#extensions#tabline#left_sep = ' '
     let g:airline#extensions#tabline#left_alt_sep = '|'
-
-    "
-    "   Manipulation with buffers and tabs.
-    "
-    Plugin 'vim-scripts/Buffergator'
-    let g:buffergator_suppress_keymaps = 1
-    let g:buffergator_viewport_split_policy = "L"
-    map ab :BuffergatorToggle<CR>
-    "map at :BuffergatorTabsToggle<CR>
-
-    "
-    "
-    "
-    "Plugin 'eiginn/netrw'
-    "let g:netrw_altv          = 1
-    "let g:netrw_fastbrowse    = 2
-    "let g:netrw_keepdir       = 0
-    "let g:netrw_liststyle     = 3
-    "let g:netrw_retmap        = 1
-    "let g:netrw_silent        = 1
-    "let g:netrw_special_syntax= 1
-    "map <C-n> :Explore<CR>
-    "map <C-m> :Explore %:p:h<CR>
-
+    let g:airline_powerline_fonts = 1
     "
     "
     "
@@ -469,6 +438,29 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:NERDTreeIgnore = ['\.o$', '\.so$', '\.tsk$']
     map at :NERDTreeToggle<CR>
     "map am :NERDTreeFind<CR>
+    "
+    "   Commented out in favour of NERDTree
+    "
+    "Plugin 'eiginn/netrw'
+    "let g:netrw_altv          = 1
+    "let g:netrw_fastbrowse    = 2
+    "let g:netrw_keepdir       = 0
+    "let g:netrw_liststyle     = 3
+    "let g:netrw_retmap        = 1
+    "let g:netrw_silent        = 1
+    "let g:netrw_special_syntax= 1
+    "map <C-n> :Explore<CR>
+    "map <C-m> :Explore %:p:h<CR>
+    "
+    "   Manipulation with buffers and tabs.
+    "
+    Plugin 'vim-scripts/Buffergator'
+    let g:buffergator_autodismiss_on_select = 0
+    let g:buffergator_autoupdate = 1
+    let g:buffergator_suppress_keymaps = 1
+    let g:buffergator_viewport_split_policy = "L"
+    map ab :BuffergatorToggle<CR>
+    "map at :BuffergatorTabsToggle<CR>
 
     "
     " :A switches to the header file (or vise versa)
@@ -491,16 +483,43 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:alternateExtensions_cpp = "h"
     let g:alternateExtensions_c = "h"
     map ah :A<CR>
+    "
+    "   Extends modeline to variables.
+    "   Needed by CF5 compile to read options right from file.
+    "
+    Plugin 'vim-scripts/let-modeline.vim'
+    "
+    "   CF5 compile.
+    "   Compiling cpp files without make file.
+    "
+    Plugin 'vishap/cf5-compile'
+    map <silent> ac :call CF5CompileOnly()<CR>
+    map <silent> ar :call CF5CompileAndRun()<CR>
+    
+    "
+    "   Provide templates
+    "
+    Plugin 'aperezdc/vim-template'
+    "let g:templates_no_autocmd = 1
+    let g:templates_no_builtin_templates = 1
+    "
+    "   Local vimrc
+    "
+    Plugin 'embear/vim-localvimrc'
 
     "
     "   Comment code.
-    "   gc - visusl mode - comment selection.
+    "   gc - visual mode - comment selection.
     "
-    "Plugin 'tpope/vim-commentary'
+    Plugin 'tpope/vim-commentary'
+    nmap al  <Plug>CommentaryLine
+    vmap al  <Plug>Commentary
     "
     "   Git wrapper.
     "
     Plugin 'tpope/vim-fugitive'
+    nmap git  :Git
+    nmap gst  :Gstatus
     "
     "   Shows git diff.
     "   [c - jump prev diff
@@ -519,7 +538,7 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:gitgutter_map_keys = 0
     let g:gitgutter_realtime = 0
     let g:gitgutter_eager = 0
-
+    let g:gitgutter_async = 1
 
     "
     "   Check syntaxis on fly.
@@ -574,6 +593,11 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     "
     "Plugin 'xterm-color-table.vim'
 
+
+    "   Promising GDB manager.
+    "
+    Plugin 'vim-scripts/gdbmgr'
+
     "
     call vundle#end()
     filetype plugin indent on