From 8b7a174ba85c5d9a011bab65924ad6a885fbf4be Mon Sep 17 00:00:00 2001
From: "Andy K. Massimino" <massimino@gatech.edu>
Date: Mon, 2 Apr 2018 09:34:23 -0400
Subject: [PATCH] Fix for patterns with \zs

---
 autoload/matchup/delim.vim | 32 ++++++++++++++++++++++++--------
 test/addrtp.vim            |  8 ++++++++
 2 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 test/addrtp.vim

diff --git a/autoload/matchup/delim.vim b/autoload/matchup/delim.vim
index 7c43138..0c590f2 100644
--- a/autoload/matchup/delim.vim
+++ b/autoload/matchup/delim.vim
@@ -336,9 +336,15 @@ function! s:get_delim(opts) " {{{1
   "  let l:re = '\%<'.(l:cursorpos+1).'c' . l:re
   endif
 
-  " allow overlapping delimiters (replaces cpo-=c)
+  " allow overlapping delimiters
   " without this, the > in <tag> would not be found
-  let l:re .= '\&'
+  if b:matchup_delim_re[a:opts.type]._engine_info.has_zs[a:opts.side]
+    let l:save_cpo = &cpo
+    noautocmd set cpo-=c
+  else
+    " faster than changing cpo but doesn't work right with \zs
+    let l:re .= '\&'
+  endif
 
   " use b:match_ignorecase
   call s:ignorecase_start()
@@ -389,6 +395,13 @@ function! s:get_delim(opts) " {{{1
     break
   endwhile
 
+  " restore cpo if necessary
+  " note: this messes with cursor position
+  if exists('l:save_cpo')
+    noautocmd let &cpo = l:save_cpo
+    let l:need_restore_cursor = 1
+  endif
+
   " reset ignorecase
   call s:ignorecase_end()
 
@@ -1072,18 +1085,21 @@ function! s:init_delim_regexes() " {{{1   !LOADER
   let l:re.all = {}
 
   let l:re.delim_tex = s:init_delim_regexes_generator('delim_tex')
+  let l:re.delim_tex._engine_info = { 'has_zs': {} }
 
   for l:k in keys(s:sidedict)
+    let l:re.delim_tex._engine_info.has_zs[l:k]
+          \ = l:re.delim_tex[l:k] =~# g:matchup#re#zs
+
+    " be explicit about regex mode (set magic mode)
+    let l:re.delim_tex[l:k] = '\m' . l:re.delim_tex[l:k]
+
     let l:re.delim_all[l:k] = l:re.delim_tex[l:k]
     let l:re.all[l:k] = l:re.delim_all[l:k]
   endfor
 
-  " be explicit about regex mode (set magic mode)
-  for l:type in values(l:re)
-    for l:side in keys(l:type)
-      let l:type[l:side] = '\m' . l:type[l:side]
-    endfor
-  endfor
+  let l:re.delim_all._engine_info = l:re.delim_tex._engine_info
+  let l:re.all._engine_info = l:re.delim_all._engine_info
 
   return l:re
 endfunction
diff --git a/test/addrtp.vim b/test/addrtp.vim
new file mode 100644
index 0000000..0943fbd
--- /dev/null
+++ b/test/addrtp.vim
@@ -0,0 +1,8 @@
+
+" rtp for testing files
+
+let s:path = expand('<sfile>:h')
+let &rtp  = s:path.'/rtp,' . &rtp
+
+runtime! ftdetect/matchuptest.vim
+