Updated table syntax to get toggled with table mode

autoload/tablemode.vim

@@ -85,8 +85,37 @@ function! s:ToggleMapping() "{{{2
   endif
 endfunction
 
+function! tablemode#SyntaxEnable()
+  exec 'syntax match Table'
+        \ '/' . tablemode#table#StartExpr() . '\zs|.\+|\ze' . tablemode#table#EndExpr() . '/'
+        \ 'contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL'
+  syntax match TableSeparator /|/ contained
+  syntax match TableColumnAlign /:/ contained
+  syntax match TableBorder /[\-+]\+/ contained
+
+  hi! link TableBorder Delimiter
+  hi! link TableSeparator Delimiter
+  hi! link TableColumnAlign Type
+endfunction
+
+function! s:ToggleSyntax()
+  if tablemode#IsActive()
+    call tablemode#SyntaxEnable()
+  else
+    syntax clear Table
+    syntax clear TableBorder
+    syntax clear TableSeparator
+    syntax clear TableColumnAlign
+
+    hi! link TableBorder NONE
+    hi! link TableSeparator NONE
+    hi! link TableColumnAlign NONE
+  endif
+endfunction
+
 function! s:SetActive(bool) "{{{2
   let b:table_mode_active = a:bool
+  call s:ToggleSyntax()
   call s:ToggleMapping()
 endfunction
 

plugin/table-mode.vim

@@ -50,25 +50,12 @@ function! s:TableEchoCell() "{{{1
   endif
 endfunction
 
-function! s:EnableTableSyntax() "{{{1
-  exec 'syntax match Table'
-        \ '/' . tablemode#table#StartExpr() . '\zs|.\+|\ze' . tablemode#table#EndExpr() . '/'
-        \ 'contains=TableBorder,TableSeparator,TableColumnAlign containedin=ALL'
-  syntax match TableSeparator /|/ contained
-  syntax match TableColumnAlign /:/ contained
-  syntax match TableBorder /[\-+]\+/ contained
-endfunction
-
 augroup TableMode
   au!
 
-  autocmd Syntax * call <SID>EnableTableSyntax()
+  autocmd Syntax * if tablemode#IsActive() | call tablemode#SyntaxEnable() | endif
 augroup END
 
-hi! link TableBorder Delimiter
-hi! link TableSeparator Delimiter
-hi! link TableColumnAlign Type
-
 " Define Commands & Mappings {{{1
 if !g:table_mode_always_active "{{{2
   exec "nnoremap <silent> " . g:table_mode_map_prefix . g:table_mode_toggle_map .