From 79166b3d4e0094ca628abdeb10ea6f093615fc3f Mon Sep 17 00:00:00 2001 From: Dhruva Sagar Date: Mon, 21 Apr 2014 14:58:02 +0530 Subject: [PATCH] Fixing #24 Exposed a public api for IsTableModeActive and using it instead. --- autoload/tablemode.vim | 18 +++++++++--------- autoload/tablemode/table.vim | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/autoload/tablemode.vim b/autoload/tablemode.vim index bd64928..4fc60a6 100644 --- a/autoload/tablemode.vim +++ b/autoload/tablemode.vim @@ -32,13 +32,6 @@ function! s:SetBufferOptDefault(opt, val) "{{{2 endif endfunction -function! s:IsTableModeActive() "{{{2 - if g:table_mode_always_active | return 1 | endif - - call s:SetBufferOptDefault('table_mode_active', 0) - return b:table_mode_active -endfunction - function! s:ToggleMapping() "{{{2 if exists('b:table_mode_active') && b:table_mode_active call s:SetBufferOptDefault('table_mode_separator_map', g:table_mode_separator) @@ -97,11 +90,18 @@ function! tablemode#scope() "{{{2 return s: endfunction +function! tablemode#IsTableModeActive() "{{{2 + if g:table_mode_always_active | return 1 | endif + + call s:SetBufferOptDefault('table_mode_active', 0) + return b:table_mode_active +endfunction + function! tablemode#TableizeInsertMode() "{{{2 - if s:IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator) + if tablemode#IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator . g:table_mode_separator) call tablemode#table#AddHeaderBorder('.') normal! A - elseif s:IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator) + elseif tablemode#IsTableModeActive() && getline('.') =~# (tablemode#table#StartExpr() . g:table_mode_separator) let column = tablemode#utils#strlen(substitute(getline('.')[0:col('.')], '[^' . g:table_mode_separator . ']', '', 'g')) let position = tablemode#utils#strlen(matchstr(getline('.')[0:col('.')], '.*' . g:table_mode_separator . '\s*\zs.*')) call tablemode#table#TableRealign('.') diff --git a/autoload/tablemode/table.vim b/autoload/tablemode/table.vim index 7a0054a..b64193d 100644 --- a/autoload/tablemode/table.vim +++ b/autoload/tablemode/table.vim @@ -27,7 +27,7 @@ function! s:HeaderBorderExpr() "{{{2 endfunction function! s:DefaultHeaderBorder() "{{{2 - if s:IsTableModeActive() + if tablemode#IsTableModeActive() return g:table_mode_corner_corner . g:table_mode_fillchar . g:table_mode_corner . g:table_mode_fillchar . g:table_mode_corner_corner else return ''