X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=blobdiff_plain;f=etc%2Ftmux.conf;h=ea20b33b153ca89f9a3af9c35dd9af759f5dbec6;hp=57e866cfb82df9ba7b45af9bc7b43bbb7f17c46c;hb=HEAD;hpb=49c58e1b7c4a579bd2ec025e4a3440ddc9edf59a

diff --git a/etc/tmux.conf b/etc/tmux.conf
index 57e866c..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 \; source-file -q ~/.tmux.conf.local \; display-message "~/.tmux.conf[.local] 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
@@ -64,4 +69,5 @@ 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
-source-file -q ~/.tmux.conf.local
+if-shell "! (env | grep -q TMUX=/tmp/tmate)" \
+  "source-file -q ~/.tmux.conf.local"