Merge pull request #104 from kaliberr44/master

yank default action for TMUX > 2.4 + MouseDragEnd1Pane

Author: docwhat

scripts/helpers.sh

@@ -21,6 +21,9 @@ yank_wo_newline_option="@copy_mode_yank_wo_newline"
 yank_selection_default="clipboard"
 yank_selection_option="@yank_selection"
 
+yank_action_default="copy-pipe-and-cancel"
+yank_action_option="@yank_action"
+
 shell_mode_default="emacs"
 shell_mode_option="@shell_mode"
 
@@ -71,6 +74,10 @@ yank_selection() {
     get_tmux_option "$yank_selection_option" "$yank_selection_default"
 }
 
+yank_action() {
+    get_tmux_option "$yank_action_option" "$yank_action_default"
+}
+
 shell_mode() {
     get_tmux_option "$shell_mode_option" "$shell_mode_default"
 }

yank.tmux

@@ -41,15 +41,15 @@ set_copy_mode_bindings() {
     local copy_wo_newline_command
     copy_wo_newline_command="$(clipboard_copy_without_newline_command "$copy_command")"
     if tmux_is_at_least 2.4; then
-        tmux bind-key -T copy-mode-vi "$(yank_key)"            send-keys -X copy-pipe-and-cancel "$copy_command"
+        tmux bind-key -T copy-mode-vi "$(yank_key)"            send-keys -X "$(yank_action)"     "$copy_command"
         tmux bind-key -T copy-mode-vi "$(put_key)"             send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
         tmux bind-key -T copy-mode-vi "$(yank_put_key)"        send-keys -X copy-pipe-and-cancel "$copy_command; tmux paste-buffer"
-        tmux bind-key -T copy-mode-vi "$(yank_wo_newline_key)" send-keys -X copy-pipe-and-cancel "$copy_wo_newline_command"
+        tmux bind-key -T copy-mode-vi "$(yank_wo_newline_key)" send-keys -X "$(yank_action)"     "$copy_wo_newline_command"
 
-        tmux bind-key -T copy-mode    "$(yank_key)"            send-keys -X copy-pipe-and-cancel "$copy_command"
+        tmux bind-key -T copy-mode    "$(yank_key)"            send-keys -X "$(yank_action)"     "$copy_command"
         tmux bind-key -T copy-mode    "$(put_key)"             send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
         tmux bind-key -T copy-mode    "$(yank_put_key)"        send-keys -X copy-pipe-and-cancel "$copy_command; tmux paste-buffer"
-        tmux bind-key -T copy-mode    "$(yank_wo_newline_key)" send-keys -X copy-pipe-and-cancel "$copy_wo_newline_command"
+        tmux bind-key -T copy-mode    "$(yank_wo_newline_key)" send-keys -X "$(yank_action)"     "$copy_wo_newline_command"
     else
         tmux bind-key -t vi-copy      "$(yank_key)"            copy-pipe "$copy_command"
         tmux bind-key -t vi-copy      "$(put_key)"             copy-pipe "tmux paste-buffer"