path: root/vim/vimrc
diff options
authorTom Ryder <tom@sanctum.geek.nz>2018-09-05 12:00:16 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-09-05 12:00:16 +1200
commitb19b04fc4ce2403187f307bb11c559274573f7f8 (patch)
tree5e437107a9b467aee671d594c4c08a5f32e6e004 /vim/vimrc
parent8026190c39d8cecdd7179cb1db35e0c72c1f4340 (diff)
parent08813ac13aae7e59bf562ef41fe0676bdff6eaa4 (diff)
Merge branch 'release/v1.67.0'v1.67.0
* release/v1.67.0: Bump VERSION Update vertical_region.vim plugin Scrap the nvim.vim runtime include Correct a comment in vim/plugin/dist.vim Require at least one char in ftdetect filenames
Diffstat (limited to 'vim/vimrc')
1 files changed, 9 insertions, 5 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 3eb6236f..2f60a31b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -95,6 +95,7 @@ if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1'
" Don't wait for a key after Escape in insert mode
+" In vim-tiny but not NeoVim, so just suppress errors
silent! set noesckeys
" Fold based on indent, but only when I ask
@@ -137,6 +138,10 @@ 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
+" This is the Vim default, but NeoVim changed it
+set laststatus=1
" Don't redraw the screen during batch execution
set lazyredraw
@@ -160,6 +165,10 @@ set nrformats-=octal
set path-=/usr/include " Let the C/C++ filetypes set that
set path+=** " Search current directory's whole tree
+" Disable command line display of file position
+" This is the Vim default, but NeoVim changed it
+set noruler
" Make sessions usable
if exists('+sessionoptions')
set sessionoptions-=localoptions " No buffer options or mappings
@@ -421,10 +430,5 @@ nnoremap <Bslash>: ^"zyg_:<C-R>z<CR>
" \! executes line with 'shell'
nnoremap <Bslash>! ^"zyg_:!<C-R>z<CR>
-" If we're running NeoVim, source some extra configuration
-if has('nvim')
- runtime nvim.vim
" Source any .vim files from ~/.vim/config
runtime! config/*.vim