diff options
| author |   nicm <nicm@openbsd.org> | 2013-10-10 12:04:38 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2013-10-10 12:04:38 +0000 |
| commit | d9ada8a18a357e36c5b3bd0fd3f9ba988e079ad5 (patch) | |
| tree | ec4ef5cb6a2dcd664af7e0463eb05479f1607b19 /usr.bin/tmux/cmd-source-file.c | |
| parent | Restore missing key binding for %, from Chris Johnsen. (diff) | |
| download | wireguard-openbsd-d9ada8a18a357e36c5b3bd0fd3f9ba988e079ad5.tar.xz wireguard-openbsd-d9ada8a18a357e36c5b3bd0fd3f9ba988e079ad5.zip | |
Make cmdq->client_exit a tristate (-1 means "not set") so that if
explicitly set it can be copied from child to parent cmdq by if-shell
and source-file. This fixes using attach or new. From Chris Johnsen.
Diffstat (limited to 'usr.bin/tmux/cmd-source-file.c')
| -rw-r--r-- | usr.bin/tmux/cmd-source-file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/tmux/cmd-source-file.c b/usr.bin/tmux/cmd-source-file.c index 56bcd95234a..04c27c2a28f 100644 --- a/usr.bin/tmux/cmd-source-file.c +++ b/usr.bin/tmux/cmd-source-file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-source-file.c,v 1.18 2013/10/10 12:00:23 nicm Exp $ */ +/* $OpenBSD: cmd-source-file.c,v 1.19 2013/10/10 12:04:38 nicm Exp $ */ /* * Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org> @@ -95,6 +95,9 @@ cmd_source_file_done(struct cmd_q *cmdq1) { struct cmd_q *cmdq = cmdq1->data; + if (cmdq1->client_exit >= 0) + cmdq->client_exit = cmdq1->client_exit; + cmdq_free(cmdq1); cfg_references--; |