commit 5b08015627e2ba1730b64286b36104bad85cf729 parent c5e3293871aaa83b2ea9ac2e6e4f418850566512 Author: edvb54 <edvb54@gmail.com> Date: Mon, 16 Jun 2014 11:25:29 -0700 Resolve compatibility problem with vim-tmux-navigator plug-in Diffstat:
| tmux.conf | | | 10 | +++++----- |
| vimrc | | | 9 | +++++++++ |
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/tmux.conf b/tmux.conf @@ -10,11 +10,11 @@ set -g pane-active-border-bg default #}}} # mappings{{{1 # vi keys for moving around panes -bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys C-h) || tmux select-pane -L" -bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys C-j) || tmux select-pane -D" -bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys C-k) || tmux select-pane -U" -bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys C-l) || tmux select-pane -R" -bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys 'C-\\') || tmux select-pane -l" +bind -n M-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys M-h) || tmux select-pane -L" +bind -n M-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys M-j) || tmux select-pane -D" +bind -n M-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys M-k) || tmux select-pane -U" +bind -n M-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys M-l) || tmux select-pane -R" +bind -n M-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)g?(view|vim?)(diff)?$' && tmux send-keys 'M-\\') || tmux select-pane -l" # vi keys for resizing around panes bind-key -r H resize-pane -L "5" diff --git a/vimrc b/vimrc @@ -122,9 +122,18 @@ smap <expr><TAB> neosnippet#expandable_or_jumpable() ? \ "\<Plug>(neosnippet_expand_or_jump)" \: "\<TAB>" +" multiple-cursor plug-in mappings let g:multi_cursor_next_key='<C-l>' let g:multi_cursor_prev_key='<C-h>' +" tmux-navigator plug-in mappings +let g:tmux_navigator_no_mappings = 1 +nnoremap <silent> <M-h> :TmuxNavigateLeft<cr> +nnoremap <silent> <M-j> :TmuxNavigateDown<cr> +nnoremap <silent> <M-k> :TmuxNavigateUp<cr> +nnoremap <silent> <M-l> :TmuxNavigateRight<cr> +nnoremap <silent> <M-\> :TmuxNavigatePrevious<cr> + "}}} " rainbow parentheses stuff{{{2 function! Config_Rainbow()