Skip to content

Commit 63ad542

Browse files
committed
Merge pull request #62 from fishman/allow_backticks
Allow backticks
2 parents 9a410c5 + 8e091d6 commit 63ad542

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

plugin/vimux.vim

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ function VimuxRunCommand(command, ...)
3838
let l:autoreturn = a:1
3939
endif
4040

41-
let g:_VimTmuxCmd = a:command
42-
let g:_VimTmuxCmdAutoreturn = l:autoreturn
41+
let s:_VimTmuxCmd = substitute(a:command, '`', '\\`', 'g')
42+
let s:_VimTmuxCmdAutoreturn = l:autoreturn
4343

4444
if l:autoreturn == 1
45-
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("g:_VimTmuxCmd"))
45+
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("s:_VimTmuxCmd"))
4646
else
47-
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("g:_VimTmuxCmd"), false)
47+
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("s:_VimTmuxCmd"), false)
4848
endif
4949
endfunction
5050

@@ -57,23 +57,23 @@ function RunVimTmuxCommand(command, ...)
5757
let l:autoreturn = a:1
5858
endif
5959

60-
let g:_VimTmuxCmd = a:command
61-
let g:_VimTmuxCmdAutoreturn = l:autoreturn
60+
let s:_VimTmuxCmd = substitute(a:command, '`', '\\`', 'g')
61+
let s:_VimTmuxCmdAutoreturn = l:autoreturn
6262

6363
if l:autoreturn == 1
64-
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("g:_VimTmuxCmd"))
64+
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("s:_VimTmuxCmd"))
6565
else
66-
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("g:_VimTmuxCmd"), false)
66+
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("s:_VimTmuxCmd"), false)
6767
endif
6868
endfunction
6969

7070

7171
function VimuxRunLastCommand()
72-
if exists("g:_VimTmuxCmd")
73-
if g:_VimTmuxCmdAutoreturn == 1
74-
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("g:_VimTmuxCmd"))
72+
if exists("s:_VimTmuxCmd")
73+
if s:_VimTmuxCmdAutoreturn == 1
74+
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("s:_VimTmuxCmd"))
7575
else
76-
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("g:_VimTmuxCmd"), false)
76+
ruby CurrentTmuxSession.new.run_shell_command(Vim.evaluate("s:_VimTmuxCmd"), false)
7777
endif
7878
else
7979
echo "No last command"
@@ -87,8 +87,8 @@ endfunction
8787

8888

8989
function VimuxClearWindow()
90-
if exists("g:_VimTmuxRunnerPane")
91-
unlet g:_VimTmuxRunnerPane
90+
if exists("s:_VimTmuxRunnerPane")
91+
unlet s:_VimTmuxRunnerPane
9292
end
9393
endfunction
9494

@@ -181,19 +181,19 @@ class TmuxSession
181181
end
182182

183183
def vim_cached_runner_pane
184-
if Vim.evaluate('exists("g:_VimTmuxRunnerPane")') != 0
185-
Vim.evaluate('g:_VimTmuxRunnerPane')
184+
if Vim.evaluate('exists("s:_VimTmuxRunnerPane")') != 0
185+
Vim.evaluate('s:_VimTmuxRunnerPane')
186186
else
187187
nil
188188
end
189189
end
190190

191191
def vim_cached_runner_pane=(runner_pane)
192-
Vim.command("let g:_VimTmuxRunnerPane = '#{runner_pane}'")
192+
Vim.command("let s:_VimTmuxRunnerPane = '#{runner_pane}'")
193193
end
194194

195195
def clear_vim_cached_runner_pane
196-
Vim.command("unlet g:_VimTmuxRunnerPane")
196+
Vim.command("unlet s:_VimTmuxRunnerPane")
197197
end
198198

199199
def clear_runner_history
@@ -271,7 +271,7 @@ class TmuxSession
271271
end
272272
@runner_pane = active_pane_id
273273
_send_command("cd #{`pwd`}", target(:pane => runner_pane))
274-
Vim.command("let g:_VimTmuxRunnerPane = '#{@runner_pane}'")
274+
Vim.command("let s:_VimTmuxRunnerPane = '#{@runner_pane}'")
275275
end
276276

277277
_run('list-panes').split("\n").map do |line|

0 commit comments

Comments
 (0)