Skip to content

Commit 252693e

Browse files
committed
Merge pull request #15 from antonishen/master
Fix: runner path issue, handle tmux not running. Fixes #13
2 parents f0bdd95 + de99c54 commit 252693e

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

plugin/vimux.vim

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ class TmuxSession
137137
_run("split-window -p #{height} #{orientation}")
138138
end
139139
@runner_pane = active_pane_id
140+
_send_command("cd #{`pwd`}", target(:pane => runner_pane))
140141
Vim.command("let g:_VimTmuxRunnerPane = '#{@runner_pane}'")
141142
end
142143

@@ -189,11 +190,15 @@ end
189190

190191
class CurrentTmuxSession < TmuxSession
191192
def initialize
192-
session = self.get_session
193-
window = self.get_property(:active, :window)
194-
pane = self.get_property(:active, :pane)
193+
if tmux?
194+
session = self.get_session
195+
window = self.get_property(:active, :window)
196+
pane = self.get_property(:active, :pane)
195197

196-
super(session, window, pane)
198+
super(session, window, pane)
199+
else
200+
raise "You are not in a tmux session"
201+
end
197202
end
198203

199204
def get_property(match, type)
@@ -205,5 +210,9 @@ class CurrentTmuxSession < TmuxSession
205210
def get_session
206211
_run("display -p '#S'").strip
207212
end
213+
214+
def tmux?
215+
`echo $TMUX` =~ /.+/ ? true : false
216+
end
208217
end
209218
EOF

0 commit comments

Comments
 (0)