diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-24 22:46:53 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-24 22:46:53 +0000 |
| commit | 76b92b2830841fd4e05006cc3cad1d8f0bc8101b (patch) | |
| tree | 16537209b06903af71cfe22119a491ba82039da2 /runtime/macros | |
| parent | c01140a1a069caf3ced83eac7d4866048c4b723e (diff) | |
| download | vim-git-76b92b2830841fd4e05006cc3cad1d8f0bc8101b.tar.gz | |
updated for version 7.0bv7.0b
Diffstat (limited to 'runtime/macros')
| -rw-r--r-- | runtime/macros/matchit.vim | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/runtime/macros/matchit.vim b/runtime/macros/matchit.vim index 296099474..a2f205076 100644 --- a/runtime/macros/matchit.vim +++ b/runtime/macros/matchit.vim @@ -1,7 +1,7 @@ " matchit.vim: (global plugin) Extended "%" matching -" Last Change: Sat May 15 11:00 AM 2004 EDT +" Last Change: Sun Feb 26 10:00 AM 2006 EST " Maintainer: Benji Fisher PhD <benji@member.AMS.org> -" Version: 1.9, for Vim 6.3 +" Version: 1.10, for Vim 6.3 " URL: http://www.vim.org/script.php?script_id=39 " Documentation: @@ -220,6 +220,10 @@ function! s:Match_wrapper(word, forward, mode) range let ini = strpart(group, 0, i-1) let mid = substitute(strpart(group, i,j-i-1), s:notslash.'\zs:', '\\|', 'g') let fin = strpart(group, j) + "Un-escape the remaining , and : characters. + let ini = substitute(ini, s:notslash . '\zs\\\(:\|,\)', '\1', 'g') + let mid = substitute(mid, s:notslash . '\zs\\\(:\|,\)', '\1', 'g') + let fin = substitute(fin, s:notslash . '\zs\\\(:\|,\)', '\1', 'g') " searchpair() requires that these patterns avoid \(\) groups. let ini = substitute(ini, s:notslash . '\zs\\(', '\\%(', 'g') let mid = substitute(mid, s:notslash . '\zs\\(', '\\%(', 'g') @@ -565,7 +569,7 @@ fun! s:Choose(patterns, string, comma, branch, prefix, suffix, ...) if a:branch == "" let currpat = current else - let currpat = substitute(current, a:branch, '\\|', 'g') + let currpat = substitute(current, s:notslash . a:branch, '\\|', 'g') endif while a:string !~ a:prefix . currpat . a:suffix let tail = strpart(tail, i) @@ -577,7 +581,7 @@ fun! s:Choose(patterns, string, comma, branch, prefix, suffix, ...) if a:branch == "" let currpat = current else - let currpat = substitute(current, a:branch, '\\|', 'g') + let currpat = substitute(current, s:notslash . a:branch, '\\|', 'g') endif if a:0 let alttail = strpart(alttail, j) |