From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Mar 2022 15:02:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/138'
X-Git-Tag: v0.19.3~1
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=71bdc48d190a5369fff28a97c828db7b1edf10a9;hp=-c;p=grml-etc-core.git

Merge remote-tracking branch 'origin/github/pr/138'
---

71bdc48d190a5369fff28a97c828db7b1edf10a9
diff --combined etc/tmux.conf
index 57e866c,71be90b..ea20b33
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@@ -22,11 -22,15 +22,15 @@@ bind-key '\' confirm-before kill-sessio
  ### 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,6 -66,3 +66,6 @@@ set -g status-right '#[fg=yellow]%Y-%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