===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-paste-buffer.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/tmux/cmd-paste-buffer.c	2014/10/20 22:29:25	1.26
--- src/usr.bin/tmux/cmd-paste-buffer.c	2014/11/05 23:25:02	1.27
***************
*** 1,4 ****
! /* $OpenBSD: cmd-paste-buffer.c,v 1.26 2014/10/20 22:29:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-paste-buffer.c,v 1.27 2014/11/05 23:25:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 49,55 ****
  	struct session		*s;
  	struct paste_buffer	*pb;
  	const char		*sepstr, *bufname;
- 	int			 pflag;
  
  	if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
  		return (CMD_RETURN_ERROR);
--- 49,54 ----
***************
*** 76,83 ****
  			else
  				sepstr = "\r";
  		}
! 		pflag = (wp->screen->mode & MODE_BRACKETPASTE);
! 		paste_send_pane(pb, wp, sepstr, args_has(args, 'p') && pflag);
  	}
  
  	/* Delete the buffer if -d. */
--- 75,81 ----
  			else
  				sepstr = "\r";
  		}
! 		paste_send_pane(pb, wp, sepstr, args_has(args, 'p'));
  	}
  
  	/* Delete the buffer if -d. */