Enforce autopairs#Utils#escape() over escape()

LunarWatcher · Jan 24, 2023 · 89e7529 · 89e7529
1 parent 130d9df
commit 89e7529
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/autoload/autopairs.vim b/autoload/autopairs.vim
@@ -342,7 +342,7 @@ func! autopairs#AutoPairsFastWrap(...)
 
             let match = []
             let esc = substitute(close, "'", "''", "g")
-            let esc = escape(esc, '\')
+            let esc = autopairs#Utils#escape(esc, opt)
 
             " TODO: Wtf is this for?
             let res = substitute(after, '^\V' .. esc, '\=add(match, submatch(0))', '')

diff --git a/autoload/autopairs/Insert.vim b/autoload/autopairs/Insert.vim
@@ -145,7 +145,7 @@ fun! autopairs#Insert#checkClose(key, before, after, afterline)
             " This may check multiline depending on something.
             " Still not entirely sure what this brings to the table that the
             " other clause doesn't
-            let m = matchstr(a:after, '\v^\s*\zs\V' .. escape(close, '\'))
+            let m = matchstr(a:after, '\v^\s*\zs\V' .. autopairs#Utils#escape(close, opt))
             if m != ''
                 if opt['multiline']
                     if b:AutoPairsMultilineCloseDeleteSpace && b:autopairs_return_pos == line('.') && getline('.') =~ '\v^\s*$'