Skip to content

Commit 6017491

Browse files
committed
feat: Make s:VimuxOption (was _VimuxOption) public VimuxOption
1 parent 5f999f4 commit 6017491

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

plugin/vimux.vim

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ if exists('g:loaded_vimux') || &compatible
33
endif
44
let g:loaded_vimux = 1
55

6-
function! s:VimuxOption(option, default)
6+
function! VimuxOption(option, default)
77
if exists(a:option)
88
return eval(a:option)
99
else
@@ -12,7 +12,7 @@ function! s:VimuxOption(option, default)
1212
endfunction
1313

1414
function! s:VimuxTmuxCmd()
15-
return s:VimuxOption('g:VimuxTmuxCommand', 'tmux')
15+
return VimuxOption('g:VimuxTmuxCommand', 'tmux')
1616
endfunction
1717

1818
if !executable(s:VimuxTmuxCmd())
@@ -60,7 +60,7 @@ function! VimuxRunCommand(command, ...)
6060
let l:autoreturn = a:1
6161
endif
6262

63-
let resetSequence = s:VimuxOption('g:VimuxResetSequence', 'q C-u')
63+
let resetSequence = VimuxOption('g:VimuxResetSequence', 'q C-u')
6464
let g:VimuxLastCommand = a:command
6565

6666
call VimuxSendKeys(resetSequence)
@@ -86,13 +86,13 @@ endfunction
8686
function! VimuxOpenRunner()
8787
let nearestIndex = s:VimuxNearestIndex()
8888

89-
if s:VimuxOption('g:VimuxUseNearest', 1) ==# 1 && nearestIndex != -1
89+
if VimuxOption('g:VimuxUseNearest', 1) ==# 1 && nearestIndex != -1
9090
let g:VimuxRunnerIndex = nearestIndex
9191
else
92-
let extraArguments = s:VimuxOption('g:VimuxOpenExtraArgs', '')
92+
let extraArguments = VimuxOption('g:VimuxOpenExtraArgs', '')
9393
if s:VimuxRunnerType() ==# 'pane'
94-
let height = s:VimuxOption('g:VimuxHeight', 20)
95-
let orientation = s:VimuxOption('g:VimuxOrientation', 'v')
94+
let height = VimuxOption('g:VimuxHeight', 20)
95+
let orientation = VimuxOption('g:VimuxOrientation', 'v')
9696
call s:VimuxTmux('split-window -p '.height.' -'.orientation.' '.extraArguments)
9797
elseif s:VimuxRunnerType() ==# 'window'
9898
call s:VimuxTmux('new-window '.extraArguments)
@@ -114,7 +114,7 @@ endfunction
114114
function! VimuxTogglePane()
115115
if exists('g:VimuxRunnerIndex')
116116
if s:VimuxRunnerType() ==# 'window'
117-
call s:VimuxTmux('join-pane -d -s '.g:VimuxRunnerIndex.' -p '.s:VimuxOption('g:VimuxHeight', 20))
117+
call s:VimuxTmux('join-pane -d -s '.g:VimuxRunnerIndex.' -p '.VimuxOption('g:VimuxHeight', 20))
118118
let g:VimuxRunnerType = 'pane'
119119
elseif s:VimuxRunnerType() ==# 'pane'
120120
let g:VimuxRunnerIndex=substitute(s:VimuxTmux('break-pane -d -t '.g:VimuxRunnerIndex." -P -F '#{window_id}'"), '\n', '', '')
@@ -168,12 +168,12 @@ endfunction
168168

169169
function! VimuxPromptCommand(...)
170170
let command = a:0 ==# 1 ? a:1 : ''
171-
let l:command = input(s:VimuxOption('g:VimuxPromptString', 'Command? '), command, 'shellcmd')
171+
let l:command = input(VimuxOption('g:VimuxPromptString', 'Command? '), command, 'shellcmd')
172172
call VimuxRunCommand(l:command)
173173
endfunction
174174

175175
function! s:VimuxTmux(arguments)
176-
if s:VimuxOption('g:VimuxDebug', 0) != 0
176+
if VimuxOption('g:VimuxDebug', 0) != 0
177177
echom s:VimuxTmuxCmd().' '.a:arguments
178178
endif
179179
return system(s:VimuxTmuxCmd().' '.a:arguments)
@@ -214,7 +214,7 @@ function! s:VimuxNearestIndex()
214214
endfunction
215215

216216
function! s:VimuxGetTargetFilter()
217-
let targetName = s:VimuxOption('g:VimuxRunnerName', '')
217+
let targetName = VimuxOption('g:VimuxRunnerName', '')
218218
if targetName ==# ''
219219
return ''
220220
endif
@@ -227,7 +227,7 @@ function! s:VimuxGetTargetFilter()
227227
endfunction
228228

229229
function! s:VimuxSetRunnerName()
230-
let targetName = s:VimuxOption('g:VimuxRunnerName', '')
230+
let targetName = VimuxOption('g:VimuxRunnerName', '')
231231
if targetName ==# ''
232232
return
233233
endif
@@ -241,7 +241,7 @@ endfunction
241241

242242

243243
function! s:VimuxRunnerType()
244-
return s:VimuxOption('g:VimuxRunnerType', 'pane')
244+
return VimuxOption('g:VimuxRunnerType', 'pane')
245245
endfunction
246246

247247
function! s:VimuxTmuxProperty(property)

0 commit comments

Comments
 (0)