aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-01-04 22:32:57 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-01-04 22:32:57 +1300
commitfd470fcbb644143c883c1015259372cbba18de76 (patch)
treee985b56be9be2a9d67c12a643419e971a239efe5
parentf64dd87e23709a5fc622dcd6e40812ce03c831ae (diff)
parentd35c99a7389f03f20ae44bb6686b49461ed7b08c (diff)
downloaddotfiles-fd470fcbb644143c883c1015259372cbba18de76.tar.gz
dotfiles-fd470fcbb644143c883c1015259372cbba18de76.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--VERSION4
-rw-r--r--vim/autoload/delimit_operator.vim50
-rw-r--r--vim/plugin/delimit_operator.vim12
-rw-r--r--vim/vimrc8
4 files changed, 2 insertions, 72 deletions
diff --git a/VERSION b/VERSION
index 4710cbdc..371f1c50 100644
--- a/VERSION
+++ b/VERSION
@@ -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()
diff --git a/vim/vimrc b/vim/vimrc
index bf30df7d..724a32e7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -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