===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -c -r1.69 -r1.70
*** src/usr.bin/tmux/cmd-attach-session.c	2017/02/06 15:00:41	1.69
--- src/usr.bin/tmux/cmd-attach-session.c	2017/03/08 13:36:12	1.70
***************
*** 1,4 ****
! /* $OpenBSD: cmd-attach-session.c,v 1.69 2017/02/06 15:00:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-attach-session.c,v 1.70 2017/03/08 13:36:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 54,61 ****
  	struct client		*c = item->client, *c_loop;
  	struct winlink		*wl = item->state.tflag.wl;
  	struct window_pane	*wp = item->state.tflag.wp;
! 	char			*cause, *cwd;
! 	struct format_tree	*ft;
  
  	if (RB_EMPTY(&sessions)) {
  		cmdq_error(item, "no sessions");
--- 54,60 ----
  	struct client		*c = item->client, *c_loop;
  	struct winlink		*wl = item->state.tflag.wl;
  	struct window_pane	*wp = item->state.tflag.wp;
! 	char			*cause;
  
  	if (RB_EMPTY(&sessions)) {
  		cmdq_error(item, "no sessions");
***************
*** 77,89 ****
  	}
  
  	if (cflag != NULL) {
- 		ft = format_create(item, FORMAT_NONE, 0);
- 		format_defaults(ft, c, s, wl, wp);
- 		cwd = format_expand(ft, cflag);
- 		format_free(ft);
- 
  		free((void *)s->cwd);
! 		s->cwd = cwd;
  	}
  
  	if (c->session != NULL) {
--- 76,83 ----
  	}
  
  	if (cflag != NULL) {
  		free((void *)s->cwd);
! 		s->cwd = format_single(item, cflag, c, s, wl, wp);
  	}
  
  	if (c->session != NULL) {