diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-09-05 12:00:16 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-09-05 12:00:16 +1200 |
commit | b19b04fc4ce2403187f307bb11c559274573f7f8 (patch) | |
tree | 5e437107a9b467aee671d594c4c08a5f32e6e004 /vim/vimrc | |
parent | Merge branch 'release/v1.66.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-b19b04fc4ce2403187f307bb11c559274573f7f8.tar.gz dotfiles-b19b04fc4ce2403187f307bb11c559274573f7f8.zip |
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')
-rw-r--r-- | vim/vimrc | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -95,6 +95,7 @@ if has('multi_byte') && !exists('$LANG') && &encoding ==# 'latin1' endif " 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 -endif - " Source any .vim files from ~/.vim/config runtime! config/*.vim |