===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-break-pane.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/cmd-break-pane.c	2016/10/16 19:04:05	1.40
--- src/usr.bin/tmux/cmd-break-pane.c	2017/01/29 22:10:55	1.41
***************
*** 1,4 ****
! /* $OpenBSD: cmd-break-pane.c,v 1.40 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-break-pane.c,v 1.41 2017/01/29 22:10:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 34,41 ****
  	.name = "break-pane",
  	.alias = "breakp",
  
! 	.args = { "dPF:s:t:", 0, 0 },
! 	.usage = "[-dP] [-F format] [-s src-pane] [-t dst-window]",
  
  	.sflag = CMD_PANE,
  	.tflag = CMD_WINDOW_INDEX,
--- 34,41 ----
  	.name = "break-pane",
  	.alias = "breakp",
  
! 	.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,60 ****
  	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;
  	int			 idx = item->state.tflag.idx;
  	struct format_tree	*ft;
  	const char		*template;
--- 53,59 ----
  	struct session		*dst_s = item->state.tflag.s;
  	struct window_pane	*wp = item->state.sflag.wp;
  	struct window		*w = wl->window;
! 	char			*name, *cause;
  	int			 idx = item->state.tflag.idx;
  	struct format_tree	*ft;
  	const char		*template;
***************
*** 78,86 ****
  	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);
  	layout_init(w, wp);
  	wp->flags |= PANE_CHANGED;
  
--- 77,92 ----
  	w = wp->window = window_create(dst_s->sx, dst_s->sy);
  	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
  	w->active = wp;
! 
! 	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;