.tmux.conf2

@@ -31,9 +31,8 @@ bind r source-file ~/.tmux.conf \; display-message "tmux.conf reloaded"
 bind m run 'old=$(tmux show -gv mouse); new="off"; if [ "$old" = "off" ]; then new="on"; fi; tmux set -g mouse $new && tmux display-message toggle\ mouse\ mode\ $new'
 ## prefix C-x: pane sync
 bind C-x set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}"
-## tmux 3.6+: copy selection without jumping to the end
-bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-selection
-bind -T copy-mode MouseDragEnd1Pane send-keys -X copy-selection
+## prevent jumping to end after mouse selection
+bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-selection -x
 ## F12: passthru
 bind -T root F12 set prefix None \; set key-table off \; set status-bg red \; refresh-client -S
 bind -T off F12 set -u prefix \; set -u key-table \; set -u status-bg \; refresh-client -S

scripts/riot

@@ -255,10 +255,6 @@ prepare_gpg_forwarding() {
         fi
     fi
 
-    # A pre-existing multiplex master cannot apply this connection's -R
-    # forwarding request. Put this first because OpenSSH keeps the first
-    # value for repeated options, and force a dedicated connection.
-    SSH_OPTIONS=("-o" "ControlMaster=no" "${SSH_OPTIONS[@]}")
     SSH_OPTIONS+=(
         # The probe already removed the old socket. Do not let the main SSH
         # connection unlink a path recreated during the gap between them.

tools/test-riot-gpg.sh

@@ -127,7 +127,6 @@ grep -Fq 'ARG=-T' "$MOCK_SSH_LOG"
 ! grep -Fq 'ARG=RequestTTY=' "$MOCK_SSH_LOG"
 grep -Fq 'ARG=StreamLocalBindUnlink=no' "$MOCK_SSH_LOG"
 grep -Fq "ARG=$MOCK_REMOTE_SOCKET:$MOCK_LOCAL_SOCKET" "$MOCK_SSH_LOG"
-grep -Fq 'ARG=ControlMaster=no' "$MOCK_SSH_LOG"
 [[ ! -e "$MOCK_REMOTE_SOCKET" ]]
 
 echo 'riot gpg forwarding tests passed'