summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2020-06-04 16:06:02 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2020-06-04 16:06:02 +0000
commit8b40ac88d47bcd1e17bc33b60cd1efc23514b5e2 (patch)
tree0624bdc1f68e79c3392703f57a608cfc30d28843
parentd7cccffb99f9d994b8c1dd9b578bebfc1b285e02 (diff)
A } can go on the same line as a command.
-rw-r--r--usr.bin/tmux/cmd-parse.y6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/tmux/cmd-parse.y b/usr.bin/tmux/cmd-parse.y
index 0c5e0f8731d..732f4cb419f 100644
--- a/usr.bin/tmux/cmd-parse.y
+++ b/usr.bin/tmux/cmd-parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-parse.y,v 1.29 2020/06/04 08:30:44 nicm Exp $ */
+/* $OpenBSD: cmd-parse.y,v 1.30 2020/06/04 16:06:01 nicm Exp $ */
/*
* Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -535,9 +535,11 @@ argument_statements : statement '}'
{
$$ = $1;
}
- | statements '}'
+ | statements statement '}'
{
$$ = $1;
+ TAILQ_CONCAT($$, $2, entry);
+ free($2);
}
%%