summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/plugin/matchparen.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index 4f68fd87bc..0fa5c4d22e 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -114,7 +114,7 @@ function! s:Highlight_Matching_Pair()
" within those syntax types (i.e., not skip). Otherwise, the cursor is
" outside of the syntax types and s_skip should keep its value so we skip any
" matching pair inside the syntax types.
- execute 'if' s_skip '| let s_skip = 0 | endif'
+ execute 'if' s_skip '| let s_skip = "0" | endif'
" Limit the search to lines visible in the window.
let stoplinebottom = line('w$')
diff --git a/src/version.c b/src/version.c
index 076778ac3c..fa4ec6052c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 115,
+/**/
114,
/**/
113,