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

Do not move cursor with emit or capture #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Do not move cursor with emit or capture #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2d62ad
Do not move cursor with emit or capture
Apr 16, 2015
8547d38
recursively capture elements
Apr 16, 2015
4161f5c
Merge remote-tracking branch 'guns/master'
May 4, 2018
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
26 changes: 25 additions & 1 deletion autoload/sexp.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2032,6 +2032,9 @@ function! sexp#stackop(mode, last, capture)
if a:mode ==? 'v'
execute "normal! \<Esc>"
let marks = s:get_visual_marks()
else
silent! normal! ix
silent! normal! x
endif

" Move to element tail first so we can skip leading macro chars
Expand All @@ -2055,18 +2058,39 @@ function! sexp#stackop(mode, last, capture)

if !(a:capture ? s:stackop_capture(a:last, pos, bpos)
\ : s:stackop_emit(a:last, pos, bpos))
throw 'sexp-error'
throw 'sexp-noop-error'
endif

if a:mode ==? 'v'
call sexp#select_current_element('n', 1)
else
let newchar = getline(cursorline)[cursorcol - 1]
if newchar != char
let cursorcol += (a:last ? 1 : -1)
endif

call cursor(cursorline, cursorcol)
endif
catch /sexp-noop-error/
if a:mode !=? 'v'
silent! undo
endif

call sexp#move_to_nearest_bracket(a:mode, a:last)
call sexp#stackop(a:mode, a:last, a:capture)
if a:mode ==? 'v'
call s:set_visual_marks(marks)
normal! gv
else
call cursor(cursorline, cursorcol)
endif
catch /sexp-error/
" Cleanup after error
if a:mode ==? 'v'
call s:set_visual_marks(marks)
normal! gv
else
silent! undo
call cursor(cursorline, cursorcol)
endif
endtry
Expand Down