Skip to content

Commit 6477995

Browse files
Terminal navigation in Vim now also checks if Tmux has been launched, and reverts to default if Tmux has not been launched (#432)
1 parent 05fa2b1 commit 6477995

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Diff for: plugin/tmux_navigator.vim

+6-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ if !get(g:, 'tmux_navigator_no_mappings', 0)
2121
nnoremap <silent> <c-l> :<C-U>TmuxNavigateRight<cr>
2222
nnoremap <silent> <c-\> :<C-U>TmuxNavigatePrevious<cr>
2323
24-
25-
tnoremap <expr> <silent> <C-h> IsFZF() ? "\<C-h>" : "\<C-w>:\<C-U> TmuxNavigateLeft\<cr>"
26-
tnoremap <expr> <silent> <C-j> IsFZF() ? "\<C-j>" : "\<C-w>:\<C-U> TmuxNavigateDown\<cr>"
27-
tnoremap <expr> <silent> <C-k> IsFZF() ? "\<C-k>" : "\<C-w>:\<C-U> TmuxNavigateUp\<cr>"
28-
tnoremap <expr> <silent> <C-l> IsFZF() ? "\<C-l>" : "\<C-w>:\<C-U> TmuxNavigateRight\<cr>"
24+
if !empty($TMUX)
25+
tnoremap <expr> <silent> <C-h> IsFZF() ? "\<C-h>" : "\<C-w>:\<C-U> TmuxNavigateLeft\<cr>"
26+
tnoremap <expr> <silent> <C-j> IsFZF() ? "\<C-j>" : "\<C-w>:\<C-U> TmuxNavigateDown\<cr>"
27+
tnoremap <expr> <silent> <C-k> IsFZF() ? "\<C-k>" : "\<C-w>:\<C-U> TmuxNavigateUp\<cr>"
28+
tnoremap <expr> <silent> <C-l> IsFZF() ? "\<C-l>" : "\<C-w>:\<C-U> TmuxNavigateRight\<cr>"
29+
endif
2930

3031
if !get(g:, 'tmux_navigator_disable_netrw_workaround', 0)
3132
if !exists('g:Netrw_UserMaps')

0 commit comments

Comments
 (0)