diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-06-20 08:45:19 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-06-20 08:45:19 +0100 |
| commit | 8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b (patch) | |
| tree | 10612c9842dbdb0749e0840cf057ca4a08a84948 /cmd-move-window.c | |
| parent | 8abcea18a24dea24d6049fefa31c877133489092 (diff) | |
| parent | 0ef3e28609ba89f53bedf40f5facc990cc57e60d (diff) | |
| download | rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.tar.gz rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.tar.bz2 rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-move-window.c')
| -rw-r--r-- | cmd-move-window.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cmd-move-window.c b/cmd-move-window.c index e765b625..b15df4f6 100644 --- a/cmd-move-window.c +++ b/cmd-move-window.c @@ -30,7 +30,7 @@ enum cmd_retval cmd_move_window_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_move_window_entry = { "move-window", "movew", - "dkrs:t:", 0, 0, + "adkrs:t:", 0, 0, "[-dkr] " CMD_SRCDST_WINDOW_USAGE, 0, cmd_move_window_exec @@ -38,7 +38,7 @@ const struct cmd_entry cmd_move_window_entry = { const struct cmd_entry cmd_link_window_entry = { "link-window", "linkw", - "dks:t:", 0, 0, + "adks:t:", 0, 0, "[-dk] " CMD_SRCDST_WINDOW_USAGE, 0, cmd_move_window_exec @@ -72,6 +72,15 @@ cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq) kflag = args_has(self->args, 'k'); dflag = args_has(self->args, 'd'); sflag = args_has(self->args, 's'); + + if (args_has(self->args, 'a')) { + s = cmd_find_session(cmdq, args_get(args, 't'), 0); + if (s == NULL) + return (CMD_RETURN_ERROR); + if ((idx = winlink_shuffle_up(s, s->curw)) == -1) + return (CMD_RETURN_ERROR); + } + if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) { cmdq_error(cmdq, "can't link window: %s", cause); |