Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unify startput functions by removing defer. #15

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −16
Open

Unify startput functions by removing defer. #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acdb6ff
Unify startput functions by removing defer.
DerWeh Jul 6, 2017
cff16b3
Use Vim's paste if invoked with default register
DerWeh Jul 7, 2017
131c6e4
No intermediate mapping, `noremap` is enough.
DerWeh Jul 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions autoload/miniyank.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ endfunction
function! miniyank#parse_cb() abort
let parts = split(&clipboard, ',')
let cbs = ''
if index(parts, "unnamed") >= 0
if index(parts, 'unnamed') >= 0
let cbs = cbs.'*'
endif
if index(parts, "unnamedplus") >= 0
if index(parts, 'unnamedplus') >= 0
let cbs = cbs.'+'
endif
return cbs
Expand Down Expand Up @@ -82,15 +82,15 @@ endfunction
let s:changedtick = -1

" TODO: put autocommand plz
function! miniyank#startput(cmd,defer) abort
if mode(1) ==# "no"
function! miniyank#startput(cmd) abort
if mode(1) ==# 'no'
return a:cmd " don't override diffput
end
let s:pastelist = miniyank#read()
let s:cmd = a:cmd
let s:visual = index(["v","V","\026"], mode()) >= 0
let s:visual = index(['v','V','\026'], mode()) >= 0
let s:count = string(v:count1)
if a:defer
if (g:miniyank_default_register != v:register)
let first = [getreg(v:register,0,1), getregtype(v:register), v:register]
if !miniyank#fix_clip(s:pastelist, first)
call miniyank#add_item(s:pastelist, first)
Expand All @@ -109,7 +109,7 @@ endfunction

function! miniyank#do_putnext() abort
if s:pastelist == []
echoerr "miniyank: no more items!"
echoerr 'miniyank: no more items!'
return
endif
call miniyank#putreg(remove(s:pastelist,0),s:cmd)
Expand Down
19 changes: 10 additions & 9 deletions plugin/miniyank.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,31 @@ if !exists('##TextYankPost')
finish
endif

if !has_key(g:,"miniyank_filename")
if !has_key(g:,'miniyank_filename')
if exists('$XDG_RUNTIME_DIR')
let g:miniyank_filename = $XDG_RUNTIME_DIR."/miniyank.mpack"
let g:miniyank_filename = $XDG_RUNTIME_DIR.'/miniyank.mpack'
else
let g:miniyank_filename = "/tmp/".$USER."_miniyank.mpack"
let g:miniyank_filename = '/tmp/'.$USER.'_miniyank.mpack'
endif
endif

if !has_key(g:,"miniyank_maxitems")
if !has_key(g:,'miniyank_maxitems')
let g:miniyank_maxitems = 10
endif

if !has_key(g:,"miniyank_delete_maxlines")
if !has_key(g:,'miniyank_delete_maxlines')
let g:miniyank_delete_maxlines = 1000
endif

augroup MiniYank
au! TextYankPost * call miniyank#on_yank(copy(v:event))
au VimEnter * let g:miniyank_default_register = v:register
\| execute 'noremap "' . v:register . 'p p'
\| execute 'noremap "' . v:register . 'P P'
augroup END

noremap <silent> <expr> <Plug>(miniyank-startput) miniyank#startput("p",0)
noremap <silent> <expr> <Plug>(miniyank-startPut) miniyank#startput("P",0)
noremap <silent> <expr> <Plug>(miniyank-autoput) miniyank#startput("p",1)
noremap <silent> <expr> <Plug>(miniyank-autoPut) miniyank#startput("P",1)
noremap <silent> <expr> <Plug>(miniyank-startput) miniyank#startput("p")
noremap <silent> <expr> <Plug>(miniyank-startPut) miniyank#startput("P")
noremap <silent> <Plug>(miniyank-cycle) :<c-u>call miniyank#cycle()<cr>

noremap <silent> <Plug>(miniyank-tochar) :<c-u>call miniyank#force_motion('v')<cr>
Expand Down