Use correct copy-mode prefix when in emacs mode

Author: thalesmello

scripts/copycat_mode_bindings.sh

@@ -24,15 +24,15 @@ extend_key() {
 	if tmux_is_at_least 2.4; then
 		# We fetch the current behavior of the 'key' mapping in
 		# variable 'cmd'
-		cmd=$(tmux list-keys -T copy-mode-$(tmux_copy_mode) | $AWK_CMD '$4 == "'$key'"' | $AWK_CMD '{ $1=""; $2=""; $3=""; $4=""; sub("  ", " "); print }')
+		cmd=$(tmux list-keys -T $(tmux_copy_mode_string) | $AWK_CMD '$4 == "'$key'"' | $AWK_CMD '{ $1=""; $2=""; $3=""; $4=""; sub("  ", " "); print }')
 		# If 'cmd' is already a copycat command, we do nothing
 		if echo "$cmd" | grep -q copycat; then
 			return
 		fi
 		# We save the previous mapping to a file in order to be able to recover
 		# the previous mapping when we unbind
-		tmux list-keys -T copy-mode-$(tmux_copy_mode) | $AWK_CMD '$4 == "'$key'"' >> /tmp/copycat_$(whoami)_recover_keys
-		tmux bind-key -T copy-mode-$(tmux_copy_mode) "$key" run-shell "tmux $cmd; $script; true"
+		tmux list-keys -T $(tmux_copy_mode_string) | $AWK_CMD '$4 == "'$key'"' >> /tmp/copycat_$(whoami)_recover_keys
+		tmux bind-key -T $(tmux_copy_mode_string) "$key" run-shell "tmux $cmd; $script; true"
 	else
 		tmux bind-key -n "$key" run-shell "tmux send-keys '$key'; $script; true"
 	fi

scripts/helpers.sh

@@ -41,6 +41,14 @@ tmux_copy_mode() {
 	tmux show-option -gwv mode-keys
 }
 
+tmux_copy_mode_string() {
+    if [ $(tmux_copy_mode) == 'vi' ]; then
+	echo copy-mode-vi
+    else
+	echo copy-mode
+    fi
+}
+
 # === copycat mode specific helpers ===
 
 set_copycat_mode() {
@@ -152,7 +160,7 @@ copycat_prev_key() {
 copycat_quit_copy_mode_keys() {
 	if tmux_is_at_least 2.4; then
 		local commands_that_quit_copy_mode="cancel"
-		local copy_mode="copy-mode-$(tmux_copy_mode)"
+		local copy_mode="$(tmux_copy_mode_string)"
 		tmux list-keys -T "$copy_mode" |
 			\grep "$commands_that_quit_copy_mode" |
 			$AWK_CMD '{ print $4 }' |