aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-29 02:12:14 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-29 02:12:14 +1200
commitcc135ce086c158012c8b740ff8e5a802b9f9ee52 (patch)
tree3178d2dbd78587561dab75245b839e833d1d81ae
parentMerge branch 'release/v1.0.0' (diff)
parentBump VERSION (diff)
downloadvim-scroll-next-master.tar.gz
vim-scroll-next-master.zip
Merge branch 'release/v2.0.0'HEADv2.0.0master
* release/v2.0.0: Reduce to just one expression
-rw-r--r--VERSION2
-rw-r--r--autoload/scroll_next.vim9
-rw-r--r--plugin/scroll_next.vim7
3 files changed, 4 insertions, 14 deletions
diff --git a/VERSION b/VERSION
index 3eefcb9..227cea2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0
+2.0.0
diff --git a/autoload/scroll_next.vim b/autoload/scroll_next.vim
deleted file mode 100644
index cb40a18..0000000
--- a/autoload/scroll_next.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-" Check visibility of last line and flick to :next if appropriate, or just
-" page forward with PageDown
-function! scroll_next#ScrollNext() abort
- if line('w$') == line('$')
- return ":\<C-U>next\<CR>"
- else
- return "\<PageDown>"
- endif
-endfunction
diff --git a/plugin/scroll_next.vim b/plugin/scroll_next.vim
index ae3f269..f9e19bf 100644
--- a/plugin/scroll_next.vim
+++ b/plugin/scroll_next.vim
@@ -10,7 +10,6 @@ if exists('loaded_scroll_next') || &compatible || v:version < 700
endif
let loaded_scroll_next = 1
-" Mapping setup
-nnoremap <expr> <silent> <unique>
- \ <Plug>(ScrollNext)
- \ scroll_next#ScrollNext()
+" If last line visible, go to next file, otherwise page down
+nnoremap <expr> <Plug>(ScrollNext)
+ \ line('w$') == line('$') ? ":\<C-U>next\<CR>" : "\<PageDown>"