vim: add GoldenView bundle

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 841be45427e20d41fe1bae6824c51ff7c5951103..5ca9cfd5841c6465f88a8da8bd9b2077aee829a6 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -24,6 +24,8 @@ Bundle 'tComment'
 Bundle 'Valloric/YouCompleteMe'
 Bundle 'elzr/vim-json'
 Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex'
+Bundle 'ervandew/ag.git'
+Bundle 'zhaocai/GoldenView.Vim'
 
 filetype plugin indent on
 
@@ -91,19 +93,28 @@ set spelllang=en_gb             " list of accepted languages
 set dictionary=spell            " list of dictionary files for keyword completion
 " Spell Check http://tex.stackexchange.com/a/52932
 let b:myLang=0
-let g:myLangList=["nospell","en_gb","en_us","de","fr"]
+let g:myLangList=["en_gb","en_us","de","fr"]
+
 function! ToggleSpell()
-  let b:myLang=b:myLang+1
-  if b:myLang>=len(g:myLangList) | let b:myLang=0 | endif
-  if b:myLang==0
-    setlocal nospell
-  else
-    execute "setlocal spell spelllang=".get(g:myLangList, b:myLang)
+  execute "setlocal spell!"
+  if (&spell)
+    echo "setlocal spelllang=" g:myLangList[b:myLang]
+  endif
+endfunction
+nnoremap <silent> <Leader>s :call ToggleSpell()<CR>
+
+function! SwitchSpell()
+  if (&spell)
+    let b:myLang=b:myLang+1
+    if b:myLang>=len(g:myLangList) | let b:myLang=0 | endif
   endif
-  echo "spell checking language:" g:myLangList[b:myLang]
+  execute "setlocal spell spelllang=".get(g:myLangList, b:myLang)
+  echo "setlocal spelllang=" g:myLangList[b:myLang]
 endfunction
-map <F10> :call ToggleSpell()<CR>
-imap <F10> <C-O>:call ToggleSpell()<CR>
+nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
+
+" fix spelling with first choice
+nnoremap <Leader>f 1z=
 
 if has("autocmd")
     au Filetype *
@@ -257,8 +268,6 @@ nmap <Leader>e :NERDTreeToggle<CR>
 nmap <F6> :NERDTreeToggle<CR>
 " <space> to open files/dirs
 let NERDTreeMapActivateNode='<space>'
-" open NERDTree if no files were selected
-autocmd vimenter * if !argc() | NERDTree | endif
 " close vim if only NERDTree is open
 autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif