summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2018-11-07 07:58:16 +0000
committernicm <nicm@openbsd.org>2018-11-07 07:58:16 +0000
commita9adeebdf0313db2537f496199aa313a1c9f8d4d (patch)
treebca128db753e984aca364d73b3060e66dca38d40
parentPrint SSLeay, OpenSSL, and LibreSSL version strings. Make client (diff)
downloadwireguard-openbsd-a9adeebdf0313db2537f496199aa313a1c9f8d4d.tar.xz
wireguard-openbsd-a9adeebdf0313db2537f496199aa313a1c9f8d4d.zip
There is no reason wait-for has to be restricted to outside tmux.
-rw-r--r--usr.bin/tmux/cmd-wait-for.c6
-rw-r--r--usr.bin/tmux/tmux.16
2 files changed, 5 insertions, 7 deletions
diff --git a/usr.bin/tmux/cmd-wait-for.c b/usr.bin/tmux/cmd-wait-for.c
index ba869388a69..63f160ffc93 100644
--- a/usr.bin/tmux/cmd-wait-for.c
+++ b/usr.bin/tmux/cmd-wait-for.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-wait-for.c,v 1.16 2016/10/16 19:04:05 nicm Exp $ */
+/* $OpenBSD: cmd-wait-for.c,v 1.17 2018/11/07 07:58:16 nicm Exp $ */
/*
* Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -170,7 +170,7 @@ cmd_wait_for_wait(struct cmdq_item *item, const char *name,
struct client *c = item->client;
struct wait_item *wi;
- if (c == NULL || c->session != NULL) {
+ if (c == NULL) {
cmdq_error(item, "not able to wait");
return (CMD_RETURN_ERROR);
}
@@ -198,7 +198,7 @@ cmd_wait_for_lock(struct cmdq_item *item, const char *name,
{
struct wait_item *wi;
- if (item->client == NULL || item->client->session != NULL) {
+ if (item->client == NULL) {
cmdq_error(item, "not able to lock");
return (CMD_RETURN_ERROR);
}
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 9f84cc8ebbf..7191974e531 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.614 2018/10/25 15:13:38 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.615 2018/11/07 07:58:16 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\"
@@ -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: October 25 2018 $
+.Dd $Mdocdate: November 7 2018 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -4430,8 +4430,6 @@ is used, the channel is locked and any clients that try to lock the same
channel are made to wait until the channel is unlocked with
.Ic wait-for
.Fl U .
-This command only works from outside
-.Nm .
.El
.Sh TERMINFO EXTENSIONS
.Nm