diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-12-16 22:01:08 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-12-16 22:01:08 +0000 |
| commit | 7c94dae702798db66424897159a44832f5dbc392 (patch) | |
| tree | 255b7f4f770c213a787618e92d56fa19066c0c94 /cmd-show-environment.c | |
| parent | f7a6482e6b2f3fec33f87d0c9fe69cfe7efc6daf (diff) | |
| parent | 8eb1a7d5dc8d66ca7d17c72e4d8d0e58d6fd2824 (diff) | |
| download | rtmux-7c94dae702798db66424897159a44832f5dbc392.tar.gz rtmux-7c94dae702798db66424897159a44832f5dbc392.tar.bz2 rtmux-7c94dae702798db66424897159a44832f5dbc392.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-show-environment.c')
| -rw-r--r-- | cmd-show-environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-show-environment.c b/cmd-show-environment.c index ad9e9e37..54baafe4 100644 --- a/cmd-show-environment.c +++ b/cmd-show-environment.c @@ -94,7 +94,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmd_q *cmdq) struct environ *env; struct environ_entry *envent; - if (args_has(self->args, 'g')) + if (args_has(self->args, 'g') || cmdq->state.tflag.s == NULL) env = global_environ; else env = cmdq->state.tflag.s->environ; |