diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-01-04 22:32:57 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-01-04 22:32:57 +1300 |
commit | fd470fcbb644143c883c1015259372cbba18de76 (patch) | |
tree | e985b56be9be2a9d67c12a643419e971a239efe5 | |
parent | Merge branch 'release/v4.7.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-b2c1a44d7bea5c5579932f5c06eadb2e93cf6275.tar.gz (sig) dotfiles-b2c1a44d7bea5c5579932f5c06eadb2e93cf6275.zip |
Merge branch 'release/v4.8.0'v4.8.0
* release/v4.8.0:
Bump VERSION
Revert "Add experimental delimit_operator.vim plugin"
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/autoload/delimit_operator.vim | 50 | ||||
-rw-r--r-- | vim/plugin/delimit_operator.vim | 12 | ||||
-rw-r--r-- | vim/vimrc | 8 |
4 files changed, 2 insertions, 72 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v4.7.0 -Fri Jan 4 01:56:39 UTC 2019 +tejr dotfiles v4.8.0 +Fri Jan 4 09:32:57 UTC 2019 diff --git a/vim/autoload/delimit_operator.vim b/vim/autoload/delimit_operator.vim deleted file mode 100644 index 026fe63f..00000000 --- a/vim/autoload/delimit_operator.vim +++ /dev/null @@ -1,50 +0,0 @@ -let s:pairs = { - \ '(': ')', - \ '<': '>', - \ '[': ']', - \ '{': '}', - \ } - -function! delimit_operator#Operatorfunc(type) abort - - let l:save = { - \ 'unnamed': @@, - \ 'clipboard': &clipboard, - \ 'selection': &selection - \ } - - set clipboard-=unnamed - set clipboard-=unnamedplus - - set selection=inclusive - - let l:delimiters = { - \ 'open': s:char, - \ 'close': get(s:pairs, s:char, s:char) - \ } - - if a:type ==# 'line' - silent normal! '[V']y - elseif a:type ==# 'block' - silent execute "normal! `[\<C-V>`]y" - else - silent normal! `[v`]y - endif - - let @@ = l:delimiters['open'] - \ . @@ - \ . l:delimiters['close'] - - silent normal! gvp - - let @@ = l:save['unnamed'] - let &clipboard = l:save['clipboard'] - let &selection = l:save['selection'] - -endfunction - -function! delimit_operator#Map() abort - let s:char = nr2char(getchar()) - set operatorfunc=delimit_operator#Operatorfunc - return 'g@' -endfunction diff --git a/vim/plugin/delimit_operator.vim b/vim/plugin/delimit_operator.vim deleted file mode 100644 index 0a3e62fc..00000000 --- a/vim/plugin/delimit_operator.vim +++ /dev/null @@ -1,12 +0,0 @@ -if exists('g:loaded_delimit_operator') || &compatible - finish -endif -if v:version < 700 - finish -endif -let g:loaded_delimit_operator = 1 - -nnoremap <expr> <Plug>(DelimitOperator) - \ delimit_operator#Map() -xnoremap <expr> <Plug>(DelimitOperator) - \ delimit_operator#Map() @@ -421,13 +421,5 @@ nnoremap <Leader>: ^"zyg_:<C-R>z<CR> " \! executes line with 'shell' nnoremap <Leader>! ^"zyg_:!<C-R>z<CR> -" Testing out delimit_operator.vim, in development -" Use q for a prefix key, followed by the wrapping quote -for s:char in ["'", '"', '`', '[', '<', '(', '{', '*'] - execute 'nmap q'.s:char.' <Plug>(DelimitOperator)'.s:char - execute 'xmap q'.s:char.' <Plug>(DelimitOperator)'.s:char -endfor -unlet s:char - " Source any .vim files from ~/.vim/config runtime! config/*.vim |