===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- src/usr.bin/tmux/cmd-attach-session.c	2014/10/20 22:29:25	1.31
+++ src/usr.bin/tmux/cmd-attach-session.c	2015/02/05 10:29:43	1.32
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-attach-session.c,v 1.31 2014/10/20 22:29:25 nicm Exp $ */
+/* $OpenBSD: cmd-attach-session.c,v 1.32 2015/02/05 10:29:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -106,11 +106,8 @@
 
 		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 @@
 
 		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);