diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-12-12 16:43:58 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-12-12 16:43:58 +0100 |
| commit | cfde76c74dd0fb1723101fd6a0fba22d3c72a1ee (patch) | |
| tree | 9d52b6d9745a1c536de4d1fc85ef08f9ab3aec24 | |
| parent | 27356ad4f47eb87eb9889d4bd06eaecc7944763f (diff) | |
updated for version 7.3.758v7.3.758
Problem: Matchit plugin does not handle space in #ifdef.
Solution: Change matching pattern to allow spaces. (Mike Morearty)
| -rw-r--r-- | runtime/macros/matchit.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/macros/matchit.vim b/runtime/macros/matchit.vim index 03dae6a2f7..74c1a1eb92 100644 --- a/runtime/macros/matchit.vim +++ b/runtime/macros/matchit.vim @@ -131,7 +131,7 @@ function! s:Match_wrapper(word, forward, mode) range " let default = substitute(escape(&mps, '[$^.*~\\/?]'), '[,:]\+', " \ '\\|', 'g').'\|\/\*\|\*\/\|#if\>\|#ifdef\>\|#else\>\|#elif\>\|#endif\>' let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") . - \ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>' + \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>' " s:all = pattern with all the keywords let match_words = match_words . (strlen(match_words) ? "," : "") . default if match_words !~ s:notslash . '\\\d' @@ -649,7 +649,7 @@ fun! s:MultiMatch(spflag, mode) " s:all regexp based on s:pat and the default groups " This part is copied and slightly modified from s:Match_wrapper(). let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") . - \ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>' + \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>' " Allow b:match_words = "GetVimMatchWords()" . if b:match_words =~ ":" let match_words = b:match_words diff --git a/src/version.c b/src/version.c index 562bb043f5..5a0f8159bc 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 758, +/**/ 757, /**/ 756, |