X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Ftmux.conf;h=a1ea76ddc7ce27f703b3673ae7aa18b799de39a9;hb=a4aa1466791b786069ec3c8abddef77e797cf876;hp=0c55b579da821f1613df87e898ef095b0f41d72f;hpb=05add691b8590d4b4532f1e0111f32dc1723494a;p=grml-etc-core.git

diff --git a/etc/tmux.conf b/etc/tmux.conf
index 0c55b57..a1ea76d 100644
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -22,11 +22,16 @@ bind-key '\' confirm-before kill-session
 ### join the last active pane to the currently active window
 bind-key j join-pane -s !
 
+### join the marked pane to the currently active window
+### ('bind-key m select-pane -m' is default to mark the current pane)
+bind-key J join-pane
+
 ### Move current window to session named "bg" (and create session if it does not exist)
 bind-key B if-shell "! tmux has-session -t bg" "new-session -d -s bg" \; move-window -t bg
 
 ### Reload Config
-bind-key R source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
+if-shell "! (env | grep -q TMUX=/tmp/tmate)" \
+  "bind-key R source-file ~/.tmux.conf \\; source-file -q ~/.tmux.conf.local \\; display-message '~/.tmux.conf[.local] reloaded'"
 
 ###rebind keys
 bind-key h next-layout
@@ -62,3 +67,7 @@ set -g status-right '#[fg=yellow]%Y-%m-%d %H:%M'
 
 set-window-option -g window-status-style fg=blue,bg=black
 set-window-option -g window-status-current-style bold
+
+### source user-specific local configuration file
+if-shell "! (env | grep -q TMUX=/tmp/tmate)" \
+  "source-file -q ~/.tmux.conf.local"