diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-08-23 12:21:02 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-08-23 12:21:02 +1200 |
commit | 0f475e8f274aa85b8434e0c835f7bdbb59744929 (patch) | |
tree | d4264fc0085f7dd3d8ecc4c3ee0f7c41b6a9bfa0 /vim | |
parent | Merge branch 'release/v1.59.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-0f475e8f274aa85b8434e0c835f7bdbb59744929.tar.gz dotfiles-0f475e8f274aa85b8434e0c835f7bdbb59744929.zip |
Merge branch 'release/v1.60.0'v1.60.0
* release/v1.60.0:
Bump VERSION
Update replace_operator.vim plugin
Update diff_prune.vim plugin
Add collation locale def for plmu(1df) sort check
Check for existence of :xmap for mapping
Diffstat (limited to 'vim')
m--------- | vim/bundle/diff_prune | 0 | ||||
m--------- | vim/bundle/replace_operator | 0 | ||||
-rw-r--r-- | vim/vimrc | 4 |
3 files changed, 3 insertions, 1 deletions
diff --git a/vim/bundle/diff_prune b/vim/bundle/diff_prune -Subproject 50080840611c7111e10e71b0443d05b9ead7698 +Subproject 389f2da8759cbbcf275798fb1e8c93114fa2dc0 diff --git a/vim/bundle/replace_operator b/vim/bundle/replace_operator -Subproject 172fbc5f7e346c26c3cc64335de1e33347f7905 +Subproject d897f61790f31c71564a761c79b8839e76192d7 @@ -299,7 +299,9 @@ nnoremap <Bslash>p :<C-U>set paste! paste?<CR> nnoremap <Bslash>q gqap " \r acts as a replacement operator nmap <Bslash>r <Plug>(ReplaceOperator) -xmap <Bslash>r <Plug>(ReplaceOperator) +if exists(':xmap') + xmap <Bslash>r <Plug>(ReplaceOperator) +endif " \R reloads ~/.vimrc nnoremap <Bslash>R :<C-U>source $MYVIMRC<CR> " \s toggles spell checking |