diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 00:09:51 +1300 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-11-30 00:09:51 +1300 |
| commit | 94816757caac0120df020ea281a8ab020256de21 (patch) | |
| tree | 854ae7eb90e67c9d24382018da2594cc9966f840 /vim/vimrc | |
| parent | Merge branch 'release/v1.78.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-94816757caac0120df020ea281a8ab020256de21.tar.gz dotfiles-94816757caac0120df020ea281a8ab020256de21.zip | |
Merge branch 'release/v2.0.0'v2.0.0
* release/v2.0.0:
Update make_target.vim to v1.2.0
Comment conditional set of <Plug>(InsertCancel)
Require Vim 7 for filetype and syntax highlights
Simplify a load guard for sh.vim syntax tweaks
Clear away a flag after HTML indent load
Remove some Vim syntax boilerplate
Pare down after/indent scripts a fair bit
Remove some overzealous b:undo_* setting
Add missing detail to a comment
Remove double-key mapping shortcuts
Remove boilerplate after/ftplugin load guards
Simplify after/ftplugin for C
Set b:did_ftplugin flag in Vim ftplugins
Adjust a vimrc comment for clarity
Simplify ft=sh subtype flag clearing
Add dummy function for HTML omnicompletion
Clear away stock ft=mail quoting maps
Wrap autocmd! clear for ft=mail in :execute
Add timestamp augroup clearing to Vim ft=html
Abbreviate Vim ft=html autocmd clearing
Restore value of 'colorcolumn' after ft=gitcommit
Wrap Vim gitcommit autocmd clear in :execute
Diffstat (limited to 'vim/vimrc')
| -rw-r--r-- | vim/vimrc | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -8,13 +8,13 @@ runtime system.vim " Load filetype settings, plugins, and maps -if has('autocmd') +if has('autocmd') && v:version >= 700 let g:maplocalleader = ',' filetype plugin indent on endif " Options dependent on the syntax feature -if has('syntax') +if has('syntax') && v:version >= 700 " Use syntax highlighting if !exists('g:syntax_on') @@ -185,9 +185,9 @@ set shortmess+=I " Prefix wrapped rows with three dots set showbreak=... -" New windows go below or to the right of a split -set splitbelow -set splitright +" New window positioning +set splitbelow " Below the current window, not above +set splitright " Right of the current window, not left " Give me a bit longer to complete mappings set timeoutlen=3000 @@ -223,7 +223,7 @@ nnoremap <silent> <C-L> :<C-U>nohlsearch<CR><C-L> vnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L> " Remap insert Ctrl-C to undo the escaped insert operation -if &loadplugins +if &loadplugins " Don't break the key if we won't be getting the plugin imap <C-C> <Plug>(InsertCancel) endif |