diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-01-31 12:52:50 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2017-01-31 12:52:50 +0000 |
| commit | 9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a (patch) | |
| tree | 11c1c9ad419ed1dc8bb7d3b67fe01c4befff1c1c /cmd-break-pane.c | |
| parent | c54a5d9fb3d282354e831b75fe0ad75035cb08b9 (diff) | |
| parent | d8da761d54ed0d2b449e412511496e67ce8d33ac (diff) | |
| download | rtmux-9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a.tar.gz rtmux-9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a.tar.bz2 rtmux-9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-break-pane.c')
| -rw-r--r-- | cmd-break-pane.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/cmd-break-pane.c b/cmd-break-pane.c index a5d4e148..c949fe8a 100644 --- a/cmd-break-pane.c +++ b/cmd-break-pane.c @@ -34,8 +34,8 @@ const struct cmd_entry cmd_break_pane_entry = { .name = "break-pane", .alias = "breakp", - .args = { "dPF:s:t:", 0, 0 }, - .usage = "[-dP] [-F format] [-s src-pane] [-t dst-window]", + .args = { "dPF:n:s:t:", 0, 0 }, + .usage = "[-dP] [-F format] [-n window-name] [-s src-pane] [-t dst-window]", .sflag = CMD_PANE, .tflag = CMD_WINDOW_INDEX, @@ -53,8 +53,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item) struct session *dst_s = item->state.tflag.s; struct window_pane *wp = item->state.sflag.wp; struct window *w = wl->window; - char *name; - char *cause; + char *name, *cause; int idx = item->state.tflag.idx; struct format_tree *ft; const char *template; @@ -78,9 +77,16 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item) w = wp->window = window_create(dst_s->sx, dst_s->sy); TAILQ_INSERT_HEAD(&w->panes, wp, entry); w->active = wp; - name = default_window_name(w); - window_set_name(w, name); - free(name); + + if (!args_has(args, 'n')) { + name = default_window_name(w); + window_set_name(w, name); + free(name); + } else { + window_set_name(w, args_get(args, 'n')); + options_set_number(w->options, "automatic-rename", 0); + } + layout_init(w, wp); wp->flags |= PANE_CHANGED; |