aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-13 23:11:58 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-13 23:11:58 +1200
commit206f8e15d4703fb8823d39ff99dcdaa61f2ee95c (patch)
tree40c6c6e315fc4ff199648f204a48a4e8ec8e40ef
parentMerge branch 'hotfix/v2.0.1' (diff)
parentBump VERSION (diff)
downloadvim-put-blank-lines-206f8e15d4703fb8823d39ff99dcdaa61f2ee95c.tar.gz
vim-put-blank-lines-206f8e15d4703fb8823d39ff99dcdaa61f2ee95c.zip
Merge branch 'release/v3.0.0'v3.0.0
* release/v3.0.0: Bump VERSION Refactor to use <expr> mappings
-rw-r--r--VERSION2
-rw-r--r--autoload/put_blank_lines.vim16
-rw-r--r--plugin/put_blank_lines.vim9
3 files changed, 14 insertions, 13 deletions
diff --git a/VERSION b/VERSION
index 38f77a6..4a36342 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.1
+3.0.0
diff --git a/autoload/put_blank_lines.vim b/autoload/put_blank_lines.vim
index 2ee8ce8..6251283 100644
--- a/autoload/put_blank_lines.vim
+++ b/autoload/put_blank_lines.vim
@@ -1,18 +1,18 @@
-function! put_blank_lines#Above(count) abort
+" Put lines above
+function! put_blank_lines#Above() abort
set operatorfunc=put_blank_lines#AboveOpfunc
- call feedkeys(a:count.'g@l', 'n')
+ return 'g@^'
endfunction
-
-function! put_blank_lines#Below(count) abort
- set operatorfunc=put_blank_lines#BelowOpfunc
- call feedkeys(a:count.'g@l', 'n')
-endfunction
-
function! put_blank_lines#AboveOpfunc(type) abort
silent put! =repeat(nr2char(10), v:count1)
']+1
endfunction
+" Put lines below
+function! put_blank_lines#Below() abort
+ set operatorfunc=put_blank_lines#BelowOpfunc
+ return 'g@^'
+endfunction
function! put_blank_lines#BelowOpfunc(type) abort
silent put =repeat(nr2char(10), v:count1)
'[-1
diff --git a/plugin/put_blank_lines.vim b/plugin/put_blank_lines.vim
index ede964a..922b4e4 100644
--- a/plugin/put_blank_lines.vim
+++ b/plugin/put_blank_lines.vim
@@ -13,9 +13,10 @@ if v:version < 700
endif
let g:loaded_put_blank_lines = 1
-nnoremap <silent> <unique>
+" Set up mappings to autoloaded functions
+nnoremap <expr> <silent> <unique>
\ <Plug>(PutBlankLinesBelow)
- \ :<C-U>call put_blank_lines#Below(v:count1)<CR>
-nnoremap <silent> <unique>
+ \ put_blank_lines#Below()
+nnoremap <expr> <silent> <unique>
\ <Plug>(PutBlankLinesAbove)
- \ :<C-U>call put_blank_lines#Above(v:count1)<CR>
+ \ put_blank_lines#Above()