diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-02-06 19:05:56 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-02-06 19:07:43 +0000 |
| commit | 833fe5bdee449b04afe8844774be66374e1baf9c (patch) | |
| tree | 11b21f479421b08f67776c832543becaa0b12fb8 /cmd-if-shell.c | |
| parent | 93c3fb78a3593afd23e85352213236131dd5958f (diff) | |
| parent | 313f2263f8bb3336893527f65789f820ba7eaf0f (diff) | |
| download | rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.tar.gz rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.tar.bz2 rtmux-833fe5bdee449b04afe8844774be66374e1baf9c.zip | |
Merge branch 'obsd-master'
Conflicts:
cmd-pipe-pane.c
Diffstat (limited to 'cmd-if-shell.c')
| -rw-r--r-- | cmd-if-shell.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index 15432919..8c6620da 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -76,12 +76,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq) } ft = format_create(); - if (s != NULL) - format_session(ft, s); - if (s != NULL && wl != NULL) - format_winlink(ft, s, wl); - if (wp != NULL) - format_window_pane(ft, wp); + format_defaults(ft, NULL, s, wl, wp); shellcmd = format_expand(ft, args->argv[0]); format_free(ft); |