Fix broken highlight due to ctrlp filetype is being set fix-broken-highlight-for-undo

8 files changed, 57 insertions, 16 deletions

diff --git a/autoload/ctrlp.vim b/autoload/ctrlp.vim
index 6128e28..94769c6 100644
--- a/autoload/ctrlp.vim
+++ b/autoload/ctrlp.vim
@@ -2551,6 +2551,10 @@ fu! ctrlp#nosy()
 	retu !( has('syntax') && exists('g:syntax_on') )
 endf
 
+fu! ctrlp#au()
+	retu has('autocmd')
+endf
+
 fu! ctrlp#hicheck(grp, defgrp)
 	if !hlexists(a:grp)
 		exe 'hi link' a:grp a:defgrp
diff --git a/autoload/ctrlp/bookmarkdir.vim b/autoload/ctrlp/bookmarkdir.vim
index f7fc14d..ff031e4 100644
--- a/autoload/ctrlp/bookmarkdir.vim
+++ b/autoload/ctrlp/bookmarkdir.vim
@@ -87,8 +87,14 @@ fu! s:syntax()
 	if !ctrlp#nosy()
 		cal ctrlp#hicheck('CtrlPBookmark', 'Identifier')
 		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
-		sy match CtrlPBookmark '^> [^\t]\+' contains=CtrlPLinePre
-		sy match CtrlPTabExtra '\zs\t.*\ze$'
+
+		if ctrlp#au()
+			aug CtrlPSyntax
+				au! FileType ctrlp,ctrlp.*
+					\ sy match CtrlPBookmark '^> [^\t]\+' contains=CtrlPLinePre |
+					\ sy match CtrlPTabExtra '\zs\t.*\ze$'
+			aug END
+		en
 	en
 endf
 " Public {{{1
diff --git a/autoload/ctrlp/buffertag.vim b/autoload/ctrlp/buffertag.vim
index f36a5cf..b2c0760 100644
--- a/autoload/ctrlp/buffertag.vim
+++ b/autoload/ctrlp/buffertag.vim
@@ -214,9 +214,15 @@ fu! s:syntax()
 		cal ctrlp#hicheck('CtrlPTagKind', 'Title')
 		cal ctrlp#hicheck('CtrlPBufName', 'Directory')
 		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
-		sy match CtrlPTagKind '\zs[^\t|]\+\ze|\d\+:[^|]\+|\d\+|'
-		sy match CtrlPBufName '|\d\+:\zs[^|]\+\ze|\d\+|'
-		sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName,CtrlPTagKind
+
+		if ctrlp#au()
+			aug CtrlPSyntax
+				au FileType <buffer> ctrlp,ctrlp.*
+					\ sy match CtrlPTagKind '\zs[^\t|]\+\ze|\d\+:[^|]\+|\d\+|' |
+					\ sy match CtrlPBufName '|\d\+:\zs[^|]\+\ze|\d\+|' |
+					\ sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName,CtrlPTagKind
+			aug END
+		en
 	en
 endf
 
diff --git a/autoload/ctrlp/changes.vim b/autoload/ctrlp/changes.vim
index 313d8c2..d58f19e 100644
--- a/autoload/ctrlp/changes.vim
+++ b/autoload/ctrlp/changes.vim
@@ -47,8 +47,14 @@ fu! s:syntax()
 	if !ctrlp#nosy()
 		cal ctrlp#hicheck('CtrlPBufName', 'Directory')
 		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
-		sy match CtrlPBufName '\t|\d\+:\zs[^|]\+\ze|\d\+:\d\+|$'
-		sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName
+
+		if ctrlp#au()
+			aug CtrlPSyntax
+				au FileType <buffer> ctrlp,ctrlp.*
+					\ sy match CtrlPBufName '\t|\d\+:\zs[^|]\+\ze|\d\+:\d\+|$' |
+					\ sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName
+			aug END
+		en
 	en
 endf
 " Public {{{1
diff --git a/autoload/ctrlp/line.vim b/autoload/ctrlp/line.vim
index f5ab83e..1d387ee 100644
--- a/autoload/ctrlp/line.vim
+++ b/autoload/ctrlp/line.vim
@@ -25,8 +25,14 @@ fu! s:syntax()
 	if !ctrlp#nosy()
 		cal ctrlp#hicheck('CtrlPBufName', 'Directory')
 		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
-		sy match CtrlPBufName '\t|\zs[^|]\+\ze|\d\+:\d\+|$'
-		sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName
+
+		if ctrlp#au()
+			aug CtrlPSyntax
+				au FileType <buffer> ctrlp,ctrlp.*
+					\ sy match CtrlPBufName '\t|\zs[^|]\+\ze|\d\+:\d\+|$' |
+					\ sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName
+			aug END
+		en
 	en
 endf
 " Public {{{1
diff --git a/autoload/ctrlp/quickfix.vim b/autoload/ctrlp/quickfix.vim
index 03ab921..d7a6668 100644
--- a/autoload/ctrlp/quickfix.vim
+++ b/autoload/ctrlp/quickfix.vim
@@ -30,7 +30,11 @@ endf
 fu! s:syntax()
 	if !ctrlp#nosy()
 		cal ctrlp#hicheck('CtrlPqfLineCol', 'Search')
-		sy match CtrlPqfLineCol '|\zs\d\+:\d\+\ze|'
+		if ctrlp#au()
+			aug CtrlPSyntax
+				au! FileType <buffer> ctrlp,ctrlp.* sy match CtrlPqfLineCol '|\zs\d\+:\d\+\ze|'
+			aug END
+		en
 	en
 endf
 " Public {{{1
diff --git a/autoload/ctrlp/tag.vim b/autoload/ctrlp/tag.vim
index c229480..ed412cf 100644
--- a/autoload/ctrlp/tag.vim
+++ b/autoload/ctrlp/tag.vim
@@ -80,7 +80,11 @@ endf
 fu! s:syntax()
 	if !ctrlp#nosy()
 		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
-		sy match CtrlPTabExtra '\zs\t.*\ze$'
+		if ctrlp#au()
+			aug CtrlPSyntax
+				au FileType <buffer> ctrlp,ctrlp.* sy match CtrlPTabExtra '\zs\t.*\ze$'
+			aug END
+		en
 	en
 endf
 " Public {{{1
diff --git a/autoload/ctrlp/undo.vim b/autoload/ctrlp/undo.vim
index dee705e..bd0f11d 100644
--- a/autoload/ctrlp/undo.vim
+++ b/autoload/ctrlp/undo.vim
@@ -85,11 +85,16 @@ fu! s:syntax()
 		\ 'Sv': 'Comment', 'Po': 'Title'})
 		cal ctrlp#hicheck('CtrlPUndo'.ke, va)
 	endfo
-	sy match CtrlPUndoT '\v\d+ \zs[^ ]+\ze|\d+:\d+:\d+'
-	sy match CtrlPUndoBr '\[\|\]'
-	sy match CtrlPUndoNr '\[\d\+\]' contains=CtrlPUndoBr
-	sy match CtrlPUndoSv 'saved'
-	sy match CtrlPUndoPo 'current'
+  if ctrlp#au()
+    aug CtrlPSyntax
+      au FileType <buffer> ctrlp,ctrlp.*
+        \ sy match CtrlPUndoT '\v\d+ \zs[^ ]+\ze|\d+:\d+:\d+' |
+        \ sy match CtrlPUndoBr '\[\|\]' |
+        \ sy match CtrlPUndoNr '\[\d\+\]' contains=CtrlPUndoBr |
+        \ sy match CtrlPUndoSv 'saved' |
+        \ sy match CtrlPUndoPo '/Users'
+    aug END
+  en
 endf
 
 fu! s:dict2list(dict)