diff options
| author |   nicm <nicm@openbsd.org> | 2015-04-21 21:24:49 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-04-21 21:24:49 +0000 |
| commit | 6df8b7e5012410224f25125a87a360f6c31e06ce (patch) | |
| tree | b0fb0e919981c87cfc6a1bc5c234ec491dec977f /usr.bin/tmux/cmd-move-window.c | |
| parent | Remove an extra lcr3 that snuck into pmap_switch during yesterday's (diff) | |
| download | wireguard-openbsd-6df8b7e5012410224f25125a87a360f6c31e06ce.tar.xz wireguard-openbsd-6df8b7e5012410224f25125a87a360f6c31e06ce.zip | |
Fix moving windows to nonexistent indexes when renumber-windows is
off. From Thomas Adam, reported by Daniel Levai and Theo Buehler.
Diffstat (limited to 'usr.bin/tmux/cmd-move-window.c')
| -rw-r--r-- | usr.bin/tmux/cmd-move-window.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/usr.bin/tmux/cmd-move-window.c b/usr.bin/tmux/cmd-move-window.c index c453f5abe6c..dd80a64838e 100644 --- a/usr.bin/tmux/cmd-move-window.c +++ b/usr.bin/tmux/cmd-move-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-move-window.c,v 1.18 2014/10/27 22:40:29 nicm Exp $ */ +/* $OpenBSD: cmd-move-window.c,v 1.19 2015/04/21 21:24:49 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -51,7 +51,7 @@ cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq) struct session *src, *dst, *s; struct winlink *wl; char *cause; - int idx, kflag, dflag; + int idx, kflag, dflag, sflag; if (args_has(args, 'r')) { s = cmd_find_session(cmdq, args_get(args, 't'), 0); @@ -71,6 +71,7 @@ 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 (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) { cmdq_error(cmdq, "can't link window: %s", cause); @@ -79,6 +80,15 @@ cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq) } if (self->entry == &cmd_move_window_entry) server_unlink_window(src, wl); + + /* + * Renumber the winlinks in the src session only, the destination + * session already has the correct winlink id to us, either + * automatically or specified by -s. + */ + if (!sflag && options_get_number(&src->options, "renumber-windows")) + session_renumber_windows(src); + recalculate_sizes(); return (CMD_RETURN_NORMAL); |