Permalink
Browse files

update

  • Loading branch information...
1 parent e72cccd commit 09858138964a3b794a120d06bf98df7a505a7472 @hSATAC committed Feb 25, 2014
Showing with 17 additions and 4 deletions.
  1. +3 −0 .gitmodules
  2. +0 −1 bundle/gocode
  3. +1 −0 bundle/vim-gocode-blackrush
  4. +13 −3 vimrc
View
@@ -150,3 +150,6 @@
path = bundle/undotree
url = https://github.com/mbbill/undotree.git
ignore = untracked
+[submodule "bundle/vim-gocode-blackrush"]
+ path = bundle/vim-gocode-blackrush
+ url = git@github.com:Blackrush/vim-gocode.git
Submodule gocode deleted from e487a8
Submodule vim-gocode-blackrush added at b3d1a9
View
16 vimrc
@@ -150,6 +150,14 @@ au BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe("norm '\"")|
:unlet! s:word
endfun
+ " Highlight trailing whitespaces
+ highlight ExtraWhitespace ctermbg=red guibg=red
+ match ExtraWhitespace /\s\+$/
+ autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
+ autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
+ autocmd InsertLeave * match ExtraWhitespace /\s\+$/
+ autocmd BufWinLeave * call clearmatches()
+
"---------------------------------------------------------------------------
" USEFUL SHORTCUTS
@@ -331,8 +339,8 @@ au BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe("norm '\"")|
"endif
" --- supertab
- let g:SuperTabDefaultCompletionType = "context"
- "let g:SuperTabDefaultCompletionType = "<c-x><c-o>"
+ "let g:SuperTabDefaultCompletionType = "context"
+ let g:SuperTabDefaultCompletionType = "<c-x><c-o>"
" --- ctrlp
map <leader>f :CtrlPMixed<CR>
@@ -388,7 +396,7 @@ au BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe("norm '\"")|
\ }
" --- nerdtree
- nnoremap <silent><F5> :NERDTreeTabsToggle<CR>
+ nnoremap <silent><F5> :NERDTreeMirrorToggle<CR>
" --- gitgutter
highlight clear SignColumn
@@ -517,3 +525,5 @@ au BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe("norm '\"")|
" --- easymotion
hi EasyMotionTarget ctermbg=none ctermfg=green
hi EasyMotionShade ctermbg=none ctermfg=blue
+
+

0 comments on commit 0985813

Please sign in to comment.