diff options
| author |   nicm <nicm@openbsd.org> | 2015-08-12 08:55:20 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-08-12 08:55:20 +0000 |
| commit | f388c9323900fbed5ddae663b9ca6538fa2d79a8 (patch) | |
| tree | b03689684079316972cc0f5f3480f456baeffd6f | |
| parent | removes two mem leaks in ti (in error path). (diff) | |
| download | wireguard-openbsd-f388c9323900fbed5ddae663b9ca6538fa2d79a8.tar.xz wireguard-openbsd-f388c9323900fbed5ddae663b9ca6538fa2d79a8.zip | |
Rename left/right/up/down relative to active pane to add -of suffix
(left-of/right-of/etc) to remove conflict with left/right meaning
leftmost or rightmost pane. From Ben Boeckel.
| -rw-r--r-- | usr.bin/tmux/cmd-find.c | 10 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/tmux/cmd-find.c b/usr.bin/tmux/cmd-find.c index a61292a3f03..5bdcf3ffebb 100644 --- a/usr.bin/tmux/cmd-find.c +++ b/usr.bin/tmux/cmd-find.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-find.c,v 1.10 2015/06/05 09:09:08 nicm Exp $ */ +/* $OpenBSD: cmd-find.c,v 1.11 2015/08/12 08:55:20 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@users.sourceforge.net> @@ -102,10 +102,10 @@ const char *cmd_find_pane_table[][2] = { { "{top-right}", "top-right" }, { "{bottom-left}", "bottom-left" }, { "{bottom-right}", "bottom-right" }, - { "{up}", "{up}" }, - { "{down}", "{down}" }, - { "{left}", "{left}" }, - { "{right}", "{right}" }, + { "{up-of}", "{up}" }, + { "{down-of}", "{down}" }, + { "{left-of}", "{left}" }, + { "{right-up}", "{right}" }, { NULL, NULL } }; diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 7e8d8139de7..509b0721267 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.446 2015/07/27 08:45:45 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.447 2015/08/12 08:55:20 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 27 2015 $ +.Dd $Mdocdate: August 12 2015 $ .Dt TMUX 1 .Os .Sh NAME @@ -496,10 +496,10 @@ The following special tokens are available for the pane index: .It Li "{top-right}" Ta "" Ta "The top-right pane" .It Li "{bottom-left}" Ta "" Ta "The bottom-left pane" .It Li "{bottom-right}" Ta "" Ta "The bottom-right pane" -.It Li "{up}" Ta "" Ta "The pane above the active pane" -.It Li "{down}" Ta "" Ta "The pane below the active pane" -.It Li "{left}" Ta "" Ta "The pane to the left of the active pane" -.It Li "{right}" Ta "" Ta "The pane to the right of the active pane" +.It Li "{up-of}" Ta "" Ta "The pane above the active pane" +.It Li "{down-of}" Ta "" Ta "The pane below the active pane" +.It Li "{left-of}" Ta "" Ta "The pane to the left of the active pane" +.It Li "{right-of}" Ta "" Ta "The pane to the right of the active pane" .El .Pp The tokens |