From 70ba3c147fffc86c9688ea7abf642d4fc92e692c Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 28 Dec 2016 10:34:34 +0000 Subject: [PATCH] Fix the prefer unattached session behaviour of attach-session/switch-client, reported by Thomas Sattle. --- cmd.c | 3 ++- tmux.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd.c b/cmd.c index abec8885..08242920 100644 --- a/cmd.c +++ b/cmd.c @@ -410,7 +410,7 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag, if (target != NULL && target[strcspn(target, ":.")] != '\0') flag = CMD_PANE; else - flag = CMD_SESSION; + flag = CMD_SESSION_PREFERUNATTACHED; } targetflags = 0; @@ -418,6 +418,7 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag, case CMD_SESSION: case CMD_SESSION_CANFAIL: case CMD_SESSION_PREFERUNATTACHED: + case CMD_SESSION_WITHPANE: if (flag == CMD_SESSION_CANFAIL) targetflags |= CMD_FIND_QUIET; if (flag == CMD_SESSION_PREFERUNATTACHED) diff --git a/tmux.h b/tmux.h index f4674e2e..3aa198b1 100644 --- a/tmux.h +++ b/tmux.h @@ -1305,7 +1305,7 @@ enum cmd_entry_flag { CMD_SESSION, CMD_SESSION_CANFAIL, CMD_SESSION_PREFERUNATTACHED, - CMD_SESSION_WITHPANE, + CMD_SESSION_WITHPANE, /* implies PREFERUNATTACHED */ CMD_WINDOW, CMD_WINDOW_CANFAIL,