===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-capture-pane.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/tmux/cmd-capture-pane.c	2019/03/14 06:36:21	1.47
--- src/usr.bin/tmux/cmd-capture-pane.c	2019/08/01 08:42:34	1.48
***************
*** 1,4 ****
! /* $OpenBSD: cmd-capture-pane.c,v 1.47 2019/03/14 06:36:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-capture-pane.c,v 1.48 2019/08/01 08:42:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
***************
*** 39,46 ****
  	.name = "capture-pane",
  	.alias = "capturep",
  
! 	.args = { "ab:CeE:JpPqS:t:", 0, 0 },
! 	.usage = "[-aCeJpPq] " CMD_BUFFER_USAGE " [-E end-line] "
  		 "[-S start-line] " CMD_TARGET_PANE_USAGE,
  
  	.target = { 't', CMD_FIND_PANE, 0 },
--- 39,46 ----
  	.name = "capture-pane",
  	.alias = "capturep",
  
! 	.args = { "ab:CeE:JNpPqS:t:", 0, 0 },
! 	.usage = "[-aCeJNpPq] " CMD_BUFFER_USAGE " [-E end-line] "
  		 "[-S start-line] " CMD_TARGET_PANE_USAGE,
  
  	.target = { 't', CMD_FIND_PANE, 0 },
***************
*** 110,116 ****
  	struct grid		*gd;
  	const struct grid_line	*gl;
  	struct grid_cell	*gc = NULL;
! 	int			 n, with_codes, escape_c0, join_lines;
  	u_int			 i, sx, top, bottom, tmp;
  	char			*cause, *buf, *line;
  	const char		*Sflag, *Eflag;
--- 110,116 ----
  	struct grid		*gd;
  	const struct grid_line	*gl;
  	struct grid_cell	*gc = NULL;
! 	int			 n, with_codes, escape_c0, join_lines, no_trim;
  	u_int			 i, sx, top, bottom, tmp;
  	char			*cause, *buf, *line;
  	const char		*Sflag, *Eflag;
***************
*** 170,180 ****
  	with_codes = args_has(args, 'e');
  	escape_c0 = args_has(args, 'C');
  	join_lines = args_has(args, 'J');
  
  	buf = NULL;
  	for (i = top; i <= bottom; i++) {
  		line = grid_string_cells(gd, 0, i, sx, &gc, with_codes,
! 		    escape_c0, !join_lines);
  		linelen = strlen(line);
  
  		buf = cmd_capture_pane_append(buf, len, line, linelen);
--- 170,181 ----
  	with_codes = args_has(args, 'e');
  	escape_c0 = args_has(args, 'C');
  	join_lines = args_has(args, 'J');
+ 	no_trim = args_has(args, 'N');
  
  	buf = NULL;
  	for (i = top; i <= bottom; i++) {
  		line = grid_string_cells(gd, 0, i, sx, &gc, with_codes,
! 		    escape_c0, !join_lines && !no_trim);
  		linelen = strlen(line);
  
  		buf = cmd_capture_pane_append(buf, len, line, linelen);