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-attach-session.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-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index 160f2a8f..a67ec82c 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -106,11 +106,8 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag, if (cflag != NULL) { ft = format_create(); - if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL) - format_client(ft, c); - format_session(ft, s); - format_winlink(ft, s, s->curw); - format_window_pane(ft, s->curw->window->active); + format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, + NULL, NULL); cp = format_expand(ft, cflag); format_free(ft); @@ -139,11 +136,8 @@ cmd_attach_session(struct cmd_q *cmdq, const char *tflag, int dflag, int rflag, if (cflag != NULL) { ft = format_create(); - if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL) - format_client(ft, c); - format_session(ft, s); - format_winlink(ft, s, s->curw); - format_window_pane(ft, s->curw->window->active); + format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, + NULL, NULL); cp = format_expand(ft, cflag); format_free(ft); |