diff options
Diffstat (limited to 'vim')
m--------- | vim/bundle/colon_operator | 0 | ||||
m--------- | vim/bundle/quickfix_auto_open | 0 | ||||
m--------- | vim/bundle/surround | 0 | ||||
-rw-r--r-- | vim/nvim.vim | 7 | ||||
-rw-r--r-- | vim/plugin/quickfix_auto_open.vim | 22 | ||||
-rw-r--r-- | vim/vimrc | 16 |
6 files changed, 13 insertions, 32 deletions
diff --git a/vim/bundle/colon_operator b/vim/bundle/colon_operator -Subproject 5525627dd9727f2ee713e3a06145a145410bcd7 +Subproject f966411229eae27333166a2e13ff868f1bf2b70 diff --git a/vim/bundle/quickfix_auto_open b/vim/bundle/quickfix_auto_open new file mode 160000 +Subproject a2eccef1861e2c0be988bc182d7b14be94ebc9e diff --git a/vim/bundle/surround b/vim/bundle/surround -Subproject aa1f120ad3a29c27cc41d581cda3751c59343cc +Subproject 597068870b8f093a8b2d11536c62ff31222ee8d diff --git a/vim/nvim.vim b/vim/nvim.vim new file mode 100644 index 00000000..3ad54f57 --- /dev/null +++ b/vim/nvim.vim @@ -0,0 +1,7 @@ +" Configuration specific to NeoVim + +" Don't show a statusline if there's only one window +set laststatus=1 + +" Disable command line display of file position +set noruler diff --git a/vim/plugin/quickfix_auto_open.vim b/vim/plugin/quickfix_auto_open.vim deleted file mode 100644 index e2f111fb..00000000 --- a/vim/plugin/quickfix_auto_open.vim +++ /dev/null @@ -1,22 +0,0 @@ -" -" quickfix_auto_open.vim: Always pop open the quickfix list or location list -" when they're changed. Dispassionately stolen from romainl's minivimrc. -" -" Author: Tom Ryder <tom@sanctum.geek.nz> -" License: Same as Vim itself -" -if exists('g:loaded_quickfix_auto_open') || &compatible - finish -endif -if !exists('##QuickfixCmdPost') || !exists('##VimEnter') - finish -endif -let g:loaded_quickfix_auto_open = 1 - -" Always pop open quickfix and location lists when changed -augroup quickfix_auto_open - autocmd! - autocmd QuickfixCmdPost [^l]* cwindow - autocmd QuickfixCmdPost l* lwindow - autocmd VimEnter * cwindow -augroup END @@ -98,9 +98,6 @@ set incsearch " Don't join lines with two spaces at the end of sentences set nojoinspaces -" Don't show a statusline if there's only one window -set laststatus=1 - " Don't redraw the screen during batch execution set lazyredraw @@ -138,7 +135,7 @@ set splitright set timeoutlen=3000 " No terminal mouse, even if we could -set ttymouse= +silent! set ttymouse= " Wildmenu settings; see also plugin/wildignore.vim set wildmenu " Use wildmenu @@ -189,12 +186,6 @@ imap <C-K><C-K> <Plug>(DigraphSearch) nnoremap <Space> <C-F> nnoremap <BS> <C-B> -" Remap normal/visual & to preserve substitution flags -nnoremap <silent> & :&&<CR> -if exists(':xnoremap') - xnoremap <silent> & :&&<CR> -endif - " Map g: as a 'colon operator' nmap g: <Plug>(ColonOperator) @@ -303,5 +294,10 @@ nnoremap <Bslash><Delete> :bdelete<CR> " \INS edits a new buffer nnoremap <Bslash><Insert> :<C-U>enew<CR> +" If we're running NeoVim, source some extra configuration +if has('nvim') + runtime nvim.vim +endif + " Source any .vim files from ~/.vim/config runtime! config/*.vim |