diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-10-26 19:53:45 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-10-26 19:53:45 +0200 |
commit | 96f45c0b6fc9e9d404e6805593ed1e0e6795e470 (patch) | |
tree | 464f7bdede1dfdc25db516ae130ce8f7d6d76efb /runtime/pack | |
parent | 8fc42964363087025a27e8c80276c706536fc4e3 (diff) | |
download | vim-git-96f45c0b6fc9e9d404e6805593ed1e0e6795e470.tar.gz |
Update runtime files
Diffstat (limited to 'runtime/pack')
-rw-r--r-- | runtime/pack/dist/opt/matchit/autoload/matchit.vim | 10 | ||||
-rw-r--r-- | runtime/pack/dist/opt/matchit/doc/matchit.txt | 8 | ||||
-rw-r--r-- | runtime/pack/dist/opt/matchit/plugin/matchit.vim | 16 |
3 files changed, 23 insertions, 11 deletions
diff --git a/runtime/pack/dist/opt/matchit/autoload/matchit.vim b/runtime/pack/dist/opt/matchit/autoload/matchit.vim index abf06d3c4..f56e9e223 100644 --- a/runtime/pack/dist/opt/matchit/autoload/matchit.vim +++ b/runtime/pack/dist/opt/matchit/autoload/matchit.vim @@ -1,6 +1,6 @@ " matchit.vim: (global plugin) Extended "%" matching " autload script of matchit plugin, see ../plugin/matchit.vim -" Last Change: 2019 Jan 28 +" Last Change: 2019 Oct 24 let s:last_mps = "" let s:last_words = ":" @@ -211,6 +211,14 @@ function matchit#Match_wrapper(word, forward, mode) range execute "if " . skip . "| let skip = '0' | endif" endif let sp_return = searchpair(ini, mid, fin, flag, skip) + if &selection isnot# 'inclusive' && a:mode == 'v' + " move cursor one pos to the right, because selection is not inclusive + " add virtualedit=onemore, to make it work even when the match ends the " line + if !(col('.') < col('$')-1) + set ve=onemore + endif + norm! l + endif let final_position = "call cursor(" . line(".") . "," . col(".") . ")" " Restore cursor position and original screen. call winrestview(view) diff --git a/runtime/pack/dist/opt/matchit/doc/matchit.txt b/runtime/pack/dist/opt/matchit/doc/matchit.txt index 81d0e8cde..689278a90 100644 --- a/runtime/pack/dist/opt/matchit/doc/matchit.txt +++ b/runtime/pack/dist/opt/matchit/doc/matchit.txt @@ -4,7 +4,7 @@ For instructions on installing this file, type `:help matchit-install` inside Vim. -For Vim version 8.1. Last change: 2019 May 05 +For Vim version 8.1. Last change: 2019 Oct 24 VIM REFERENCE MANUAL by Benji Fisher et al @@ -375,6 +375,10 @@ The back reference '\'.d refers to the same thing as '\'.b:match_table[d] in ============================================================================== 5. Known Bugs and Limitations *matchit-bugs* +Repository: https://github.com/chrisbra/matchit/ +Bugs can be reported at the repository (alternatively you can send me a mail). +The latest development snapshot can also be downloaded there. + Just because I know about a bug does not mean that it is on my todo list. I try to respond to reports of bugs that cause real problems. If it does not cause serious problems, or if there is a work-around, a bug may sit there for @@ -386,4 +390,4 @@ try to implement this in a future version. (This is not so easy to arrange as you might think!) ============================================================================== -vim:tw=78:fo=tcq2:ft=help: +vim:tw=78:ts=8:fo=tcq2:ft=help: diff --git a/runtime/pack/dist/opt/matchit/plugin/matchit.vim b/runtime/pack/dist/opt/matchit/plugin/matchit.vim index 84147f1fc..4d0f4e014 100644 --- a/runtime/pack/dist/opt/matchit/plugin/matchit.vim +++ b/runtime/pack/dist/opt/matchit/plugin/matchit.vim @@ -1,13 +1,13 @@ " matchit.vim: (global plugin) Extended "%" matching " Maintainer: Christian Brabandt -" Version: 1.15 -" Last Change: 2019 Jan 28 +" Version: 1.16 +" Last Change: 2019 Oct 24 " Repository: https://github.com/chrisbra/matchit " Previous URL:http://www.vim.org/script.php?script_id=39 " Previous Maintainer: Benji Fisher PhD <benji@member.AMS.org> " Documentation: -" The documentation is in a separate file: ../doc/matchit.txt . +" The documentation is in a separate file: ../doc/matchit.txt " Credits: " Vim editor by Bram Moolenaar (Thanks, Bram!) @@ -48,8 +48,8 @@ set cpo&vim nnoremap <silent> <Plug>(MatchitNormalForward) :<C-U>call matchit#Match_wrapper('',1,'n')<CR> nnoremap <silent> <Plug>(MatchitNormalBackward) :<C-U>call matchit#Match_wrapper('',0,'n')<CR> -vnoremap <silent> <Plug>(MatchitVisualForward) :<C-U>call matchit#Match_wrapper('',1,'v')<CR>m'gv`` -vnoremap <silent> <Plug>(MatchitVisualBackward) :<C-U>call matchit#Match_wrapper('',0,'v')<CR>m'gv`` +xnoremap <silent> <Plug>(MatchitVisualForward) :<C-U>call matchit#Match_wrapper('',1,'v')<CR>m'gv`` +xnoremap <silent> <Plug>(MatchitVisualBackward) :<C-U>call matchit#Match_wrapper('',0,'v')<CR>m'gv`` onoremap <silent> <Plug>(MatchitOperationForward) :<C-U>call matchit#Match_wrapper('',1,'o')<CR> onoremap <silent> <Plug>(MatchitOperationBackward) :<C-U>call matchit#Match_wrapper('',0,'o')<CR> @@ -63,8 +63,8 @@ omap <silent> g% <Plug>(MatchitOperationBackward) " Analogues of [{ and ]} using matching patterns: nnoremap <silent> <Plug>(MatchitNormalMultiBackward) :<C-U>call matchit#MultiMatch("bW", "n")<CR> nnoremap <silent> <Plug>(MatchitNormalMultiForward) :<C-U>call matchit#MultiMatch("W", "n")<CR> -vnoremap <silent> <Plug>(MatchitVisualMultiBackward) :<C-U>call matchit#MultiMatch("bW", "n")<CR>m'gv`` -vnoremap <silent> <Plug>(MatchitVisualMultiForward) :<C-U>call matchit#MultiMatch("W", "n")<CR>m'gv`` +xnoremap <silent> <Plug>(MatchitVisualMultiBackward) :<C-U>call matchit#MultiMatch("bW", "n")<CR>m'gv`` +xnoremap <silent> <Plug>(MatchitVisualMultiForward) :<C-U>call matchit#MultiMatch("W", "n")<CR>m'gv`` onoremap <silent> <Plug>(MatchitOperationMultiBackward) :<C-U>call matchit#MultiMatch("bW", "o")<CR> onoremap <silent> <Plug>(MatchitOperationMultiForward) :<C-U>call matchit#MultiMatch("W", "o")<CR> @@ -76,7 +76,7 @@ omap <silent> [% <Plug>(MatchitOperationMultiBackward) omap <silent> ]% <Plug>(MatchitOperationMultiForward) " text object: -vmap <silent> <Plug>(MatchitVisualTextObject) <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward) +xmap <silent> <Plug>(MatchitVisualTextObject) <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward) xmap a% <Plug>(MatchitVisualTextObject) " Call this function to turn on debugging information. Every time the main |