From 96f45c0b6fc9e9d404e6805593ed1e0e6795e470 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 26 Oct 2019 19:53:45 +0200 Subject: Update runtime files --- runtime/pack/dist/opt/matchit/autoload/matchit.vim | 10 +++++++++- runtime/pack/dist/opt/matchit/doc/matchit.txt | 8 ++++++-- runtime/pack/dist/opt/matchit/plugin/matchit.vim | 16 ++++++++-------- 3 files changed, 23 insertions(+), 11 deletions(-) (limited to 'runtime/pack/dist/opt') diff --git a/runtime/pack/dist/opt/matchit/autoload/matchit.vim b/runtime/pack/dist/opt/matchit/autoload/matchit.vim index abf06d3c4c..f56e9e223d 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 81d0e8cdee..689278a902 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 84147f1fc8..4d0f4e014a 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 " 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 (MatchitNormalForward) :call matchit#Match_wrapper('',1,'n') nnoremap (MatchitNormalBackward) :call matchit#Match_wrapper('',0,'n') -vnoremap (MatchitVisualForward) :call matchit#Match_wrapper('',1,'v')m'gv`` -vnoremap (MatchitVisualBackward) :call matchit#Match_wrapper('',0,'v')m'gv`` +xnoremap (MatchitVisualForward) :call matchit#Match_wrapper('',1,'v')m'gv`` +xnoremap (MatchitVisualBackward) :call matchit#Match_wrapper('',0,'v')m'gv`` onoremap (MatchitOperationForward) :call matchit#Match_wrapper('',1,'o') onoremap (MatchitOperationBackward) :call matchit#Match_wrapper('',0,'o') @@ -63,8 +63,8 @@ omap g% (MatchitOperationBackward) " Analogues of [{ and ]} using matching patterns: nnoremap (MatchitNormalMultiBackward) :call matchit#MultiMatch("bW", "n") nnoremap (MatchitNormalMultiForward) :call matchit#MultiMatch("W", "n") -vnoremap (MatchitVisualMultiBackward) :call matchit#MultiMatch("bW", "n")m'gv`` -vnoremap (MatchitVisualMultiForward) :call matchit#MultiMatch("W", "n")m'gv`` +xnoremap (MatchitVisualMultiBackward) :call matchit#MultiMatch("bW", "n")m'gv`` +xnoremap (MatchitVisualMultiForward) :call matchit#MultiMatch("W", "n")m'gv`` onoremap (MatchitOperationMultiBackward) :call matchit#MultiMatch("bW", "o") onoremap (MatchitOperationMultiForward) :call matchit#MultiMatch("W", "o") @@ -76,7 +76,7 @@ omap [% (MatchitOperationMultiBackward) omap ]% (MatchitOperationMultiForward) " text object: -vmap (MatchitVisualTextObject) (MatchitVisualMultiBackward)o(MatchitVisualMultiForward) +xmap (MatchitVisualTextObject) (MatchitVisualMultiBackward)o(MatchitVisualMultiForward) xmap a% (MatchitVisualTextObject) " Call this function to turn on debugging information. Every time the main -- cgit v1.2.3