===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-capture-pane.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- src/usr.bin/tmux/cmd-capture-pane.c	2013/03/22 15:51:15	1.15
+++ src/usr.bin/tmux/cmd-capture-pane.c	2013/03/22 15:51:54	1.16
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-capture-pane.c,v 1.15 2013/03/22 15:51:15 nicm Exp $ */
+/* $OpenBSD: cmd-capture-pane.c,v 1.16 2013/03/22 15:51:54 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
@@ -31,8 +31,8 @@
 
 const struct cmd_entry cmd_capture_pane_entry = {
 	"capture-pane", "capturep",
-	"b:E:pS:t:", 0, 0,
-	"[-p] [-b buffer-index] [-E end-line] [-S start-line]"
+	"eb:E:pS:t:", 0, 0,
+	"[-ep] [-b buffer-index] [-E end-line] [-S start-line]"
 	CMD_TARGET_PANE_USAGE,
 	0,
 	NULL,
@@ -46,12 +46,13 @@
 	struct args		*args = self->args;
 	struct client		*c = ctx->cmdclient;
 	struct window_pane	*wp;
-	char 			*buf, *line, *cause;
+	char			*buf, *line, *cause;
 	struct screen		*s;
 	struct grid		*gd;
-	int			 buffer, n;
+	int			 buffer, n, with_codes;
 	u_int			 i, limit, top, bottom, tmp;
-	size_t         		 len, linelen;
+	size_t			 len, linelen;
+	struct grid_cell	*gc;
 
 	if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL)
 		return (CMD_RETURN_ERROR);
@@ -89,16 +90,19 @@
 		top = tmp;
 	}
 
+	gc = NULL;
+	with_codes = args_has(args, 'e');
 	for (i = top; i <= bottom; i++) {
-	       line = grid_string_cells(s->grid, 0, i, screen_size_x(s));
-	       linelen = strlen(line);
+		line = grid_string_cells(s->grid, 0, i, screen_size_x(s),
+		    &gc, with_codes);
+		linelen = strlen(line);
 
-	       buf = xrealloc(buf, 1, len + linelen + 1);
-	       memcpy(buf + len, line, linelen);
-	       len += linelen;
-	       buf[len++] = '\n';
+		buf = xrealloc(buf, 1, len + linelen + 1);
+		memcpy(buf + len, line, linelen);
+		len += linelen;
+		buf[len++] = '\n';
 
-	       free(line);
+		free(line);
 	}
 
 	if (args_has(args, 'p')) {