diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-08-04 21:13:41 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-08-04 21:13:41 +1200 |
commit | c014449d3205142d00d5aea53d1e70d108c2b85b (patch) | |
tree | 313e5f78a671bf17f1ab4078977137329dd2451e /vim/vimrc | |
parent | Merge branch 'release/v1.43.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-c014449d3205142d00d5aea53d1e70d108c2b85b.tar.gz dotfiles-c014449d3205142d00d5aea53d1e70d108c2b85b.zip |
Merge branch 'release/v1.44.0'v1.44.0
* release/v1.44.0:
Bump VERSION
Update cursorline_current.vim plugin to hotfix
Spin cursorline_current.vim out into plugin
Make insert-mode cursorline ducking configurable
Remove conditionals for 'cursorline' hooks
Remove illegal :wincmd range prefix
Require Vim 7 for cursorline_current.vim
Add cursorline_current.vim plugin
Correct comments on Vim maps to show mappings
Correct start-of-line jumps in Vim line exec maps
Diffstat (limited to 'vim/vimrc')
-rw-r--r-- | vim/vimrc | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -61,6 +61,11 @@ set comments= " Give me a prompt instead of just rejecting risky :write, :saveas set confirm +" Only turn on 'cursorline' if my colorscheme loaded +if exists('g:colors_name') && g:colors_name ==# 'sahara' + set cursorline +endif + " Try to keep swapfiles in one system-appropriate dir set directory^=~/.vim/cache/swap//,~/vimfiles/cache/swap// @@ -256,9 +261,9 @@ nnoremap <Bslash>j :<C-U>buffers<CR>:buffer<Space> nnoremap <Bslash>k :<C-U>marks<CR> " \l toggles showing tab, end-of-line, and trailing whitespace nnoremap <Bslash>l :<C-U>setlocal list! list?<CR> -" \m shows all maps +" \m shows normal maps nnoremap <Bslash>m :<C-U>map<CR> -" \M shows buffer-local maps +" \M shows buffer-local normal maps nnoremap <Bslash>M :<C-U>map <buffer><CR> " \n toggles line numbers nnoremap <Bslash>n :<C-U>setlocal number! number?<CR> @@ -324,11 +329,11 @@ nnoremap <Bslash><Insert> :<C-U>enew<CR> " Execution mappings; each of these clobbers register z " \@ executes line in normal mode -nnoremap <Bslash>@ g^"zyg_@z +nnoremap <Bslash>@ ^"zyg_@z " \: executes line in command mode -nnoremap <Bslash>: g^"zyg_:<C-R>z<CR> +nnoremap <Bslash>: ^"zyg_:<C-R>z<CR> " \! executes line with 'shell' -nnoremap <Bslash>! g^"zyg_:!<C-R>z<CR> +nnoremap <Bslash>! ^"zyg_:!<C-R>z<CR> " If we're running NeoVim, source some extra configuration if has('nvim') |