diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-26 19:20:22 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-26 19:20:22 +1200 |
| commit | 7ebefe15c2765c5aaa7b01085506cfbbd98146d4 (patch) | |
| tree | 5bdaf5a21635b39163f9eae86d720852bf8ec239 /vim/vimrc | |
| parent | Merge branch 'release/v1.40.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-e96946fbb467945b5f03e7f7d00d176cb2381c90.tar.gz (sig) dotfiles-e96946fbb467945b5f03e7f7d00d176cb2381c90.zip | |
Merge branch 'release/v1.41.0'v1.41.0
* release/v1.41.0:
Bump VERSION
Move NeoVim-specific config to subfile
Set 'noruler' in .vimrc
Set 'ttymouse' silently
Correct VIMRC path for NeoVim install target
Stamp down three new ShellCheck 0.5.0 errors
Update colon_operator.vim plugin
Remove & remaps
Spin quickfix_auto_open.vim out into a plugin
Diffstat (limited to 'vim/vimrc')
| -rw-r--r-- | vim/vimrc | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -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 |