vim: j and k should be silent

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 6192c9f67fd3c9ed8fc5c596563df37a37066061..8b35883c1250dfa2c9f56045bd94dac5cc2030bf 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,11 +31,13 @@ Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
 Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
 Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }

+" fix some issue with vim-clang-format not finding .clang-format
+let g:clang_format#detect_style_file = 1

 Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
 Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'
 Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
 Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'

-Plug 'shougo/vimproc.vim'
+Plug 'shougo/vimproc.vim', {'do': 'make'}

 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'
 Plug 'tomtom/tcomment_vim'
 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'
 Plug 'tomtom/tcomment_vim'


@@ -419,8 +421,8 @@ cnoremap <C-A> <Home>
 cnoremap <C-E> <End>
 
 " proper movement when lines are wrapped
 cnoremap <C-E> <End>
 
 " proper movement when lines are wrapped

-noremap <expr> j (v:count == 0 ? 'gj' : 'j')
-noremap <expr> k (v:count == 0 ? 'gk' : 'k')
+noremap <silent><expr> j (v:count == 0 ? 'gj' : 'j')
+noremap <silent><expr> k (v:count == 0 ? 'gk' : 'k')

 
 " disable arrows
 noremap  <Up>    <NOP>
 
 " disable arrows
 noremap  <Up>    <NOP>