aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-29 13:10:25 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-29 13:10:25 +1200
commit6c4b8783de61c593e2383de58cfc21146face122 (patch)
tree96733fbf35b1907b257ceb125288c4d618e4cb0e
parentMerge branch 'release/v3.1.0' (diff)
parentBump VERSION (diff)
downloadvim-put-blank-lines-6c4b8783de61c593e2383de58cfc21146face122.tar.gz
vim-put-blank-lines-6c4b8783de61c593e2383de58cfc21146face122.zip
Merge branch 'release/v4.0.0'HEADv4.0.0master
* release/v4.0.0: Refactor
-rw-r--r--VERSION2
-rw-r--r--autoload/put_blank_lines.vim24
-rw-r--r--doc/put_blank_lines.txt2
-rw-r--r--plugin/put_blank_lines.vim15
4 files changed, 18 insertions, 25 deletions
diff --git a/VERSION b/VERSION
index fd2a018..fcdb2e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0
+4.0.0
diff --git a/autoload/put_blank_lines.vim b/autoload/put_blank_lines.vim
index 6251283..5d48193 100644
--- a/autoload/put_blank_lines.vim
+++ b/autoload/put_blank_lines.vim
@@ -1,19 +1,17 @@
-" Put lines above
-function! put_blank_lines#Above() abort
- set operatorfunc=put_blank_lines#AboveOpfunc
+" Entry point
+function! put_blank_lines#(above) abort
+ let &operatorfunc = 'put_blank_lines#'
+ \ . (a:above ? 'Above' : 'Below')
return 'g@^'
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@^'
+" Operator functions
+let s:space = nr2char(10)
+function! put_blank_lines#Above(type) abort
+ silent put! =repeat(s:space, v:count1)
+ ']+1
endfunction
-function! put_blank_lines#BelowOpfunc(type) abort
- silent put =repeat(nr2char(10), v:count1)
+function! put_blank_lines#Below(type) abort
+ silent put =repeat(s:space, v:count1)
'[-1
endfunction
diff --git a/doc/put_blank_lines.txt b/doc/put_blank_lines.txt
index 87076c4..46ae6a8 100644
--- a/doc/put_blank_lines.txt
+++ b/doc/put_blank_lines.txt
@@ -1,4 +1,4 @@
-*put_blank_lines.txt* For Vim version 7.0 Last change: 2018 July 13
+*put_blank_lines.txt* For Vim version 7.0 Last change: 2019 May 29
DESCRIPTION *put_blank_lines*
diff --git a/plugin/put_blank_lines.vim b/plugin/put_blank_lines.vim
index f779f46..6d08790 100644
--- a/plugin/put_blank_lines.vim
+++ b/plugin/put_blank_lines.vim
@@ -5,18 +5,13 @@
" Author: Tom Ryder <tom@sanctum.geek.nz>
" License: Same as Vim itself
"
-if exists('loaded_put_blank_lines') || &compatible
- finish
-endif
-if v:version < 700
+if exists('loaded_put_blank_lines') || &compatible || v:version < 700
finish
endif
let loaded_put_blank_lines = 1
" Set up mappings to autoloaded functions
-nnoremap <expr> <silent> <unique>
- \ <Plug>(PutBlankLinesBelow)
- \ put_blank_lines#Below()
-nnoremap <expr> <silent> <unique>
- \ <Plug>(PutBlankLinesAbove)
- \ put_blank_lines#Above()
+nnoremap <expr> <Plug>(PutBlankLinesBelow)
+ \ put_blank_lines#(0)
+nnoremap <expr> <Plug>(PutBlankLinesAbove)
+ \ put_blank_lines#(1)