X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Ftmux.conf;h=ea20b33b153ca89f9a3af9c35dd9af759f5dbec6;hb=71bdc48d190a5369fff28a97c828db7b1edf10a9;hp=c7e529eea24d384feab8ad4b9a218fec03058c61;hpb=82f35203de680422dddfa6974542d1a32c2754a3;p=grml-etc-core.git

diff --git a/etc/tmux.conf b/etc/tmux.conf
index c7e529e..ea20b33 100644
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -16,17 +16,21 @@ unbind space
 bind-key space next-window
 bind-key C-space next-window
 bind-key K confirm-before kill-pane
-bind-key \\ confirm-before kill-session
+bind-key '\' confirm-before kill-session
 #bind-key C-h previous-window
 
 ### 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"
+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 +66,6 @@ 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
+source-file -q ~/.tmux.conf.local