mirror of
https://github.com/vim/vim.git
synced 2025-07-04 23:07:33 -04:00
updated for version 7.3.758
Problem: Matchit plugin does not handle space in #ifdef. Solution: Change matching pattern to allow spaces. (Mike Morearty)
This commit is contained in:
parent
27356ad4f4
commit
cfde76c74d
@ -131,7 +131,7 @@ function! s:Match_wrapper(word, forward, mode) range
|
|||||||
" let default = substitute(escape(&mps, '[$^.*~\\/?]'), '[,:]\+',
|
" let default = substitute(escape(&mps, '[$^.*~\\/?]'), '[,:]\+',
|
||||||
" \ '\\|', 'g').'\|\/\*\|\*\/\|#if\>\|#ifdef\>\|#else\>\|#elif\>\|#endif\>'
|
" \ '\\|', 'g').'\|\/\*\|\*\/\|#if\>\|#ifdef\>\|#else\>\|#elif\>\|#endif\>'
|
||||||
let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
|
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
|
" s:all = pattern with all the keywords
|
||||||
let match_words = match_words . (strlen(match_words) ? "," : "") . default
|
let match_words = match_words . (strlen(match_words) ? "," : "") . default
|
||||||
if match_words !~ s:notslash . '\\\d'
|
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
|
" s:all regexp based on s:pat and the default groups
|
||||||
" This part is copied and slightly modified from s:Match_wrapper().
|
" This part is copied and slightly modified from s:Match_wrapper().
|
||||||
let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
|
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()" .
|
" Allow b:match_words = "GetVimMatchWords()" .
|
||||||
if b:match_words =~ ":"
|
if b:match_words =~ ":"
|
||||||
let match_words = b:match_words
|
let match_words = b:match_words
|
||||||
|
@ -725,6 +725,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
758,
|
||||||
/**/
|
/**/
|
||||||
757,
|
757,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user