jon/dots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed tmux mouse and xresources merge conflict

Browse Source
This commit is contained in:
jomido
2018-07-22 14:28:20 -05:00
parent e9a1e917d4
commit d71ae981d4
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tmux/.tmux.conf
View File

@@ -33,11 +33,11 @@ set -g mode-keys vi
# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
# copy/paste: shift+left click to highlight, then shift+middle to past
if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
'set -g mouse on' \
'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on'
#if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
# 'set -g mouse on' \
# 'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on'
#set -g mouse on
set -g mouse on
#'set -g mouse on; set -g mouse-utf8 on' \
bind-key Tab last-window
@@ -99,4 +99,3 @@ bind -T off F12 \
set -u status-right \;\
set -u status-bg \;\
display-message "EXIT inner tmux ..."
>>>>>>> 4009da94841e784ad85e3e9fde7f6146d8627c23