diff options
| author |   nicm <nicm@openbsd.org> | 2013-03-28 15:08:12 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2013-03-28 15:08:12 +0000 |
| commit | 02d42a7f0900c5d03f062544d0c77db4b728889f (patch) | |
| tree | 3cb75fd8e8bc255e015b7d98f3ad1ead732683c7 | |
| parent | Make copy-mode -u still scroll up if already in copy mode, handy for (diff) | |
| download | wireguard-openbsd-02d42a7f0900c5d03f062544d0c77db4b728889f.tar.xz wireguard-openbsd-02d42a7f0900c5d03f062544d0c77db4b728889f.zip | |
If -s to swap-pane is not given, use the current pane.
| -rw-r--r-- | usr.bin/tmux/cmd-swap-pane.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/tmux/cmd-swap-pane.c b/usr.bin/tmux/cmd-swap-pane.c index 75a7cce35c7..433fce5d85b 100644 --- a/usr.bin/tmux/cmd-swap-pane.c +++ b/usr.bin/tmux/cmd-swap-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-swap-pane.c,v 1.16 2013/03/24 09:57:59 nicm Exp $ */ +/* $OpenBSD: cmd-swap-pane.c,v 1.17 2013/03/28 15:08:12 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -75,8 +75,12 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq) src_wp = TAILQ_PREV(dst_wp, window_panes, entry); if (src_wp == NULL) src_wp = TAILQ_LAST(&dst_w->panes, window_panes); - } else - return (CMD_RETURN_NORMAL); + } else { + src_wl = cmd_find_pane(cmdq, NULL, NULL, &src_wp); + if (src_wl == NULL) + return (CMD_RETURN_ERROR); + src_w = src_wl->window; + } } else { src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp); if (src_wl == NULL) |